diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-12 23:40:11 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-12 23:40:11 +0000 |
| commit | b232aed7d43af0cf5168b6c62964fbf02a237f95 (patch) | |
| tree | 149caf719f5635d9948afa633f2f9daa8117832e | |
| parent | 7504d1d47f30ca78bcdfb8d75fcd6eabb5780277 (diff) | |
| download | chef-b232aed7d43af0cf5168b6c62964fbf02a237f95.tar.gz | |
Bump version to 12.21.29 by Expeditorv12.21.29
| -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 8a9396f5a7..6625a46eb5 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.28 --> -## [v12.21.28](https://github.com/chef/chef/tree/v12.21.28) (2017-11-15) +<!-- latest_release 12.21.29 --> +## [v12.21.29](https://github.com/chef/chef/tree/v12.21.29) (2017-12-12) #### Merged Pull Requests -- Use Chef::VersionConstraint in useradd_spec test [#6586](https://github.com/chef/chef/pull/6586) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) +- Backport RHEL and ifconfig test fixes [#6659](https://github.com/chef/chef/pull/6659) ([scotthain](https://github.com/scotthain)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- 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 --> - Change a useradd_spec test for RHEL >= 6.8 and >= 7.3 [#6556](https://github.com/chef/chef/pull/6556) ([jeremiahsnapp](https://github.com/jeremiahsnapp)) <!-- 12.21.27 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 7daba8ebd6..28a5c0fc07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.28) + chef (12.21.29) addressable bundler (>= 1.10) - chef-config (= 12.21.28) + chef-config (= 12.21.29) 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.28-universal-mingw32) + chef (12.21.29-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.28) + chef-config (= 12.21.29) 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.28) + chef-config (12.21.29) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.28
\ No newline at end of file +12.21.29
\ 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 d65f43603c..a2abedae11 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.28" + VERSION = "12.21.29" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index cc7b866dcb..db3b5ad2de 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.28" + VERSION = "12.21.29" end # |