diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-03-09 00:11:15 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-03-09 00:11:15 +0000 |
commit | a671180029968689fc395dc78594ef33fa148b21 (patch) | |
tree | d517d577a4e2fd59a1144bd147dd4b2caa38acc3 | |
parent | ecc21100d3f7d07f54f49eabdd0581e8fda3c92f (diff) | |
download | chef-a671180029968689fc395dc78594ef33fa148b21.tar.gz |
Bump version to 14.11.22 by Chef Expeditorv14.11.22
Obvious fix; these changes are the result of automation not creative thinking.
-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 3cde1f3794..e77dffdcd1 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 14.11.22 --> +## [v14.11.22](https://github.com/chef/chef/tree/v14.11.22) (2019-03-09) + +#### Merged Pull Requests +- windows_certificate: Import nested certificates while importing P7B certs [#8274](https://github.com/chef/chef/pull/8274) ([tas50](https://github.com/tas50)) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=14.11.21 --> +### Changes since 14.11.21 release + +#### Merged Pull Requests +- windows_certificate: Import nested certificates while importing P7B certs [#8274](https://github.com/chef/chef/pull/8274) ([tas50](https://github.com/tas50)) <!-- 14.11.22 --> <!-- release_rollup --> <!-- latest_stable_release --> @@ -2422,4 +2430,4 @@ of partial templates. * Fixed a bug where nested resources that inherited from Resource::LWRPBase 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) +* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index d3eac11066..bf200f4175 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.11.21) + chef (14.11.22) addressable bundler (>= 1.10) - chef-config (= 14.11.21) + chef-config (= 14.11.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -31,10 +31,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.11.21-universal-mingw32) + chef (14.11.22-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.11.21) + chef-config (= 14.11.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -78,7 +78,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.11.21) + chef-config (14.11.22) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.11.21
\ No newline at end of file +14.11.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 e0cd0ab463..f38e802214 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 = "14.11.21".freeze + VERSION = "14.11.22".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 2d81aa2033..fa37e2ab4d 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("14.11.21") + VERSION = Chef::VersionString.new("14.11.22") end # |