diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-03-19 00:02:33 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-03-19 00:02:33 +0000 |
commit | ee22f5340983d27fa7598183136d0eae978340ea (patch) | |
tree | 0a0b88c99d6c0f70766eddf719f055c63eb4bf4b | |
parent | 89daf43c4efb03d2adea1670d677bb14f73aa254 (diff) | |
download | chef-ee22f5340983d27fa7598183136d0eae978340ea.tar.gz |
Bump version to 14.11.23 by Chef Expeditorv14.11.23
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-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, 15 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e77dffdcd1..f878464ddb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.11.22 --> -## [v14.11.22](https://github.com/chef/chef/tree/v14.11.22) (2019-03-09) +<!-- latest_release 14.11.23 --> +## [v14.11.23](https://github.com/chef/chef/tree/v14.11.23) (2019-03-19) #### 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)) +- Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- latest_release --> <!-- release_rollup since=14.11.21 --> ### Changes since 14.11.21 release #### Merged Pull Requests +- Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.11.23 --> - 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 --> diff --git a/Gemfile.lock b/Gemfile.lock index bf200f4175..fd37d11c9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.11.22) + chef (14.11.23) addressable bundler (>= 1.10) - chef-config (= 14.11.22) + chef-config (= 14.11.23) 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.22-universal-mingw32) + chef (14.11.23-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.11.22) + chef-config (= 14.11.23) 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.22) + chef-config (14.11.23) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -88,7 +88,8 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.4.0) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) appbundler (0.11.6) mixlib-cli (~> 1.4) mixlib-shellout (~> 2.0) @@ -240,6 +241,7 @@ GEM pry-stack_explorer (0.4.9.3) binding_of_caller (>= 0.7) pry (>= 0.9.11) + public_suffix (3.0.3) pusher-client (0.6.2) json websocket (~> 1.0) @@ -1 +1 @@ -14.11.22
\ No newline at end of file +14.11.23
\ 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 f38e802214..dbfcfa3fe5 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.22".freeze + VERSION = "14.11.23".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index fa37e2ab4d..b5ae534c42 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.22") + VERSION = Chef::VersionString.new("14.11.23") end # |