diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-19 18:56:53 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-19 18:56:53 +0000 |
| commit | 5f1986bea648b48afe48212a72049ba8d2c16fd6 (patch) | |
| tree | bb185833b5ef6afb1361907f3c4b55c5ddeb46d5 | |
| parent | 2f2694e8f15de0b105293e756af1312bff7bebfd (diff) | |
| download | chef-5f1986bea648b48afe48212a72049ba8d2c16fd6.tar.gz | |
Bump version to 12.21.31 by Expeditorv12.21.31
| -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 e69f1a84ac..6f98377983 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.30 --> -## [v12.21.30](https://github.com/chef/chef/tree/v12.21.30) (2017-12-14) +<!-- latest_release 12.21.31 --> +## [v12.21.31](https://github.com/chef/chef/tree/v12.21.31) (2017-12-19) #### Merged Pull Requests -- Update openssl to 1.0.2.n [#6666](https://github.com/chef/chef/pull/6666) ([tas50](https://github.com/tas50)) +- Backport acceptance changes [#6681](https://github.com/chef/chef/pull/6681) ([scotthain](https://github.com/scotthain)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Backport acceptance changes [#6681](https://github.com/chef/chef/pull/6681) ([scotthain](https://github.com/scotthain)) <!-- 12.21.31 --> - Update openssl to 1.0.2.n [#6666](https://github.com/chef/chef/pull/6666) ([tas50](https://github.com/tas50)) <!-- 12.21.30 --> - Backport RHEL and ifconfig test fixes [#6659](https://github.com/chef/chef/pull/6659) ([scotthain](https://github.com/scotthain)) <!-- 12.21.29 --> - Use Chef::VersionConstraint in useradd_spec test [#6586](https://github.com/chef/chef/pull/6586) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) <!-- 12.21.28 --> diff --git a/Gemfile.lock b/Gemfile.lock index 35c8b9e4b5..12cc6a24f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.30) + chef (12.21.31) addressable bundler (>= 1.10) - chef-config (= 12.21.30) + chef-config (= 12.21.31) 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.30-universal-mingw32) + chef (12.21.31-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.30) + chef-config (= 12.21.31) 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.30) + chef-config (12.21.31) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.30
\ No newline at end of file +12.21.31
\ 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 f7f9bbdb9f..88361dc9bb 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.30" + VERSION = "12.21.31" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 449c3046ba..9fe6563672 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.30" + VERSION = "12.21.31" end # |