diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-10 03:07:05 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-10 03:07:05 +0000 |
| commit | 68957b1fb3b29cbfe051fb4fe6ad15219f54ad5a (patch) | |
| tree | 9247a13faf64674f0697f17aeb53ff0538471bb2 | |
| parent | c855e3a81d8235a6228b7b9484af2142b7033327 (diff) | |
| download | chef-12.21.16.tar.gz | |
Bump version to 12.21.16 by Chef Expeditorv12.21.16
| -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 08cbab9589..6f84c23ebe 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.15 --> -## [v12.21.15](https://github.com/chef/chef/tree/v12.21.15) (2017-10-04) +<!-- latest_release 12.21.16 --> +## [v12.21.16](https://github.com/chef/chef/tree/v12.21.16) (2017-10-10) #### Merged Pull Requests -- Backport #6435 to Chef-12: dnf_resource [#6436](https://github.com/chef/chef/pull/6436) ([NaomiReeves](https://github.com/NaomiReeves)) +- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) <!-- 12.21.16 --> - Backport #6435 to Chef-12: dnf_resource [#6436](https://github.com/chef/chef/pull/6436) ([NaomiReeves](https://github.com/NaomiReeves)) <!-- 12.21.15 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 8ebc6e05a8..280d5c9dda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.15) + chef (12.21.16) addressable bundler (>= 1.10) - chef-config (= 12.21.15) + chef-config (= 12.21.16) 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.15-universal-mingw32) + chef (12.21.16-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.15) + chef-config (= 12.21.16) 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.15) + chef-config (12.21.16) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.15
\ No newline at end of file +12.21.16
\ 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 3158d36ecc..cbc5811f5a 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.15" + VERSION = "12.21.16" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 1dab288b0f..c6c33815be 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.15" + VERSION = "12.21.16" end # |