diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-20 00:30:15 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-20 00:30:15 +0000 |
commit | c823c39886dd81e5a89570a2f64e76026dd1f3fc (patch) | |
tree | 0ad09b8d84520a7b96c37abb5688eacabda482fe | |
parent | bd7e7c4ed47e342cba8e572a64546d3e7b26e45d (diff) | |
download | chef-c823c39886dd81e5a89570a2f64e76026dd1f3fc.tar.gz |
Bump version to 12.22.3 by Expeditorv12.22.3
-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 4ee92a9e3f..797370fb5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.22.2 --> -## [v12.22.2](https://github.com/chef/chef/tree/v12.22.2) (2018-03-16) +<!-- latest_release 12.22.3 --> +## [v12.22.3](https://github.com/chef/chef/tree/v12.22.3) (2018-03-20) #### Merged Pull Requests -- Pass pointer to LsaFreeMemory, not FFI::MemoryPointer [#6992](https://github.com/chef/chef/pull/6992) ([btm](https://github.com/btm)) +- Fix regression in #6980, add functional tests [#7011](https://github.com/chef/chef/pull/7011) ([btm](https://github.com/btm)) <!-- latest_release --> <!-- release_rollup since=12.22.1 --> ### Changes since 12.22.1 release #### Merged Pull Requests +- Fix regression in #6980, add functional tests [#7011](https://github.com/chef/chef/pull/7011) ([btm](https://github.com/btm)) <!-- 12.22.3 --> - Pass pointer to LsaFreeMemory, not FFI::MemoryPointer [#6992](https://github.com/chef/chef/pull/6992) ([btm](https://github.com/btm)) <!-- 12.22.2 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index f9b43d57fb..ae98f6b1ab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.22.2) + chef (12.22.3) addressable bundler (>= 1.10) - chef-config (= 12.22.2) + chef-config (= 12.22.3) 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.22.2-universal-mingw32) + chef (12.22.3-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.22.2) + chef-config (= 12.22.3) 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.22.2) + chef-config (12.22.3) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.22.2
\ No newline at end of file +12.22.3
\ 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 55148f99a0..0295d5878c 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.22.2" + VERSION = "12.22.3" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b165857373..de6d0758c3 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.22.2" + VERSION = "12.22.3" end # |