diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-18 19:40:44 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-18 19:40:44 +0000 |
| commit | 61e88a7fb452f38f65563882e85210a65dfa604d (patch) | |
| tree | 1da35bb67405ca8b51a51378ff7659c1cfb756c1 | |
| parent | e4e444b2b363e4c0a6221c6a2fa1904c1da904d2 (diff) | |
| download | chef-61e88a7fb452f38f65563882e85210a65dfa604d.tar.gz | |
Bump version to 12.21.22 by Expeditorv12.21.22
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7d93d97c..535d1ae5d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.21 --> -## [v12.21.21](https://github.com/chef/chef/tree/v12.21.21) (2017-10-18) +<!-- latest_release 12.21.22 --> +## [v12.21.22](https://github.com/chef/chef/tree/v12.21.22) (2017-10-18) #### Merged Pull Requests -- Don't use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50)) +- Pull in Ohai 8.24.1 [#6506](https://github.com/chef/chef/pull/6506) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- Pull in Ohai 8.24.1 [#6506](https://github.com/chef/chef/pull/6506) ([tas50](https://github.com/tas50)) <!-- 12.21.22 --> - Don't use the safe navigation operator which requires Ruby 2.3 [#6508](https://github.com/chef/chef/pull/6508) ([tas50](https://github.com/tas50)) <!-- 12.21.21 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index cc42090f09..816f854dfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.21) + chef (12.21.22) addressable bundler (>= 1.10) - chef-config (= 12.21.21) + chef-config (= 12.21.22) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -67,10 +67,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.21.21-universal-mingw32) + chef (12.21.22-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.21) + chef-config (= 12.21.22) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -111,7 +111,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.21.21) + chef-config (12.21.22) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.21
\ No newline at end of file +12.21.22
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 797c0604e7..82fe712272 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.21" + VERSION = "12.21.22" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index be9e78bd6e..4d00b094cd 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.21" + VERSION = "12.21.22" end # |