diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-19 08:47:28 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-19 08:47:28 +0000 |
| commit | 11f0b67ebd323f402ab6bb6516da688634f9e648 (patch) | |
| tree | acfde66efb71b252b155e7a6b7478c85e5dd8655 | |
| parent | 0480bc06acbc03ad42346c76dd67092611554528 (diff) | |
| download | chef-11f0b67ebd323f402ab6bb6516da688634f9e648.tar.gz | |
Bump version to 12.21.24 by Expeditorv12.21.24
| -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 2017dce51f..cf6c286058 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.23 --> -## [v12.21.23](https://github.com/chef/chef/tree/v12.21.23) (2017-10-18) +<!-- latest_release 12.21.24 --> +## [v12.21.24](https://github.com/chef/chef/tree/v12.21.24) (2017-10-19) #### Merged Pull Requests -- Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) +- Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([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.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) <!-- 12.21.24 --> - Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) <!-- 12.21.23 --> - 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 --> diff --git a/Gemfile.lock b/Gemfile.lock index 5c7ebce635..3ca5fdd3e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.23) + chef (12.21.24) addressable bundler (>= 1.10) - chef-config (= 12.21.23) + chef-config (= 12.21.24) 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.23-universal-mingw32) + chef (12.21.24-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.23) + chef-config (= 12.21.24) 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.23) + chef-config (12.21.24) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.23
\ No newline at end of file +12.21.24
\ 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 979016ac5e..0d82a89d9d 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.23" + VERSION = "12.21.24" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3707ac965b..05031d49c6 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.23" + VERSION = "12.21.24" end # |