diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-04 00:29:56 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-04 00:29:56 +0000 |
| commit | c2869b01147182ce6155e2fbb434b6d45a0dbf0c (patch) | |
| tree | d8738ba6a1af09a0cb4efec4d237356207419e5c | |
| parent | 11b1fe9b5da8e5bc0073355dfdc8c626a39a839a (diff) | |
| download | chef-c2869b01147182ce6155e2fbb434b6d45a0dbf0c.tar.gz | |
Bump version to 12.21.15 by Chef Expeditorv12.21.15
| -rw-r--r-- | CHANGELOG.md | 14 | ||||
| -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, 19 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fd917f74a..08cbab9589 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release --> +<!-- latest_release 12.21.15 --> +## [v12.21.15](https://github.com/chef/chef/tree/v12.21.15) (2017-10-04) + +#### Merged Pull Requests +- Backport #6435 to Chef-12: dnf_resource [#6436](https://github.com/chef/chef/pull/6436) ([NaomiReeves](https://github.com/NaomiReeves)) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=13.5.3 --> +### Changes since 13.5.3 release + +#### Merged Pull Requests +- 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 --> <!-- latest_stable_release --> @@ -1425,4 +1433,4 @@ of partial templates. would not share the same actions/default_action as their parent * Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional) * Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) -* Windows package type should be a symbol (Fixes #1997) +* Windows package type should be a symbol (Fixes #1997)
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index ff9f48fdd4..8ebc6e05a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.14) + chef (12.21.15) addressable bundler (>= 1.10) - chef-config (= 12.21.14) + chef-config (= 12.21.15) 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.14-universal-mingw32) + chef (12.21.15-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.14) + chef-config (= 12.21.15) 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.14) + chef-config (12.21.15) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.14
\ No newline at end of file +12.21.15
\ 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 3b172b1d22..3158d36ecc 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.14" + VERSION = "12.21.15" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a5e9632605..1dab288b0f 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.14" + VERSION = "12.21.15" end # |