diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-12 17:41:41 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-12 17:41:41 +0000 |
| commit | 4f5ea8361722955d3a8e61afac2d5478943fa789 (patch) | |
| tree | 5e95895d1a9d8b986f4f5139233f44f685b9e136 | |
| parent | 9f0e99728baddbcd2295145374fd45432968845b (diff) | |
| download | chef-4f5ea8361722955d3a8e61afac2d5478943fa789.tar.gz | |
Bump version to 12.21.17 by Chef Expeditorv12.21.17
| -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 6f84c23ebe..87dcf26847 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.16 --> -## [v12.21.16](https://github.com/chef/chef/tree/v12.21.16) (2017-10-10) +<!-- latest_release 12.21.17 --> +## [v12.21.17](https://github.com/chef/chef/tree/v12.21.17) (2017-10-12) #### Merged Pull Requests -- Support new CriticalOhaiPlugins (backport #6486 to chef-12) [#6487](https://github.com/chef/chef/pull/6487) ([jaymzh](https://github.com/jaymzh)) +- backport of #6490 [#6492](https://github.com/chef/chef/pull/6492) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- backport of #6490 [#6492](https://github.com/chef/chef/pull/6492) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 12.21.17 --> - 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 280d5c9dda..b095f9fe7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.16) + chef (12.21.17) addressable bundler (>= 1.10) - chef-config (= 12.21.16) + chef-config (= 12.21.17) 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.16-universal-mingw32) + chef (12.21.17-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.16) + chef-config (= 12.21.17) 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.16) + chef-config (12.21.17) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.16
\ No newline at end of file +12.21.17
\ 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 cbc5811f5a..f9b3fc50f3 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.16" + VERSION = "12.21.17" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index c6c33815be..334c3e0da7 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.16" + VERSION = "12.21.17" end # |