diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-21 09:52:52 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-21 09:52:52 +0000 |
| commit | b2de1122b922f35be94c2ff23abe48676f13cc47 (patch) | |
| tree | 7a541540f6179734ca513c8ee10a90887b288da4 | |
| parent | b59b5657a228864bfacd91e64a8fb07bb0fbc3d4 (diff) | |
| download | chef-b2de1122b922f35be94c2ff23abe48676f13cc47.tar.gz | |
Bump version to 12.22.0 by Expeditorv12.22.0
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d1f37c63e..8eb50dfeb4 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.37 --> -## [v12.21.37](https://github.com/chef/chef/tree/v12.21.37) (2018-02-09) +<!-- latest_release unreleased --> +## Unreleased #### Merged Pull Requests -- Use the version of LicenseScout that comes with the Omnibus gem. [#6840](https://github.com/chef/chef/pull/6840) ([tduffield](https://github.com/tduffield)) +- Bump libxml2 to 2.9.7 and prep 12.22 release [#6881](https://github.com/chef/chef/pull/6881) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=12.21.31 --> ### Changes since 12.21.31 release #### Merged Pull Requests +- Bump libxml2 to 2.9.7 and prep 12.22 release [#6881](https://github.com/chef/chef/pull/6881) ([tas50](https://github.com/tas50)) <!-- 12.22.0 --> - Use the version of LicenseScout that comes with the Omnibus gem. [#6840](https://github.com/chef/chef/pull/6840) ([tduffield](https://github.com/tduffield)) <!-- 12.21.37 --> - Fix tests on AIX [#6819](https://github.com/chef/chef/pull/6819) ([thommay](https://github.com/thommay)) <!-- 12.21.36 --> - backport #6746 [#6817](https://github.com/chef/chef/pull/6817) ([thommay](https://github.com/thommay)) <!-- 12.21.35 --> diff --git a/Gemfile.lock b/Gemfile.lock index 43c6762235..288c650c00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.37) + chef (12.22.0) addressable bundler (>= 1.10) - chef-config (= 12.21.37) + chef-config (= 12.22.0) 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.37-universal-mingw32) + chef (12.22.0-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.37) + chef-config (= 12.22.0) 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.37) + chef-config (12.22.0) addressable fuzzyurl mixlib-config (~> 2.0) diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 0d26de4993..476b3cfff1 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.37" + VERSION = "12.22.0" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 65d7802fe3..93fc61bdcd 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.37" + VERSION = "12.22.0" end # |