diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-04-12 15:02:32 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-04-12 15:02:32 +0000 |
commit | c7f11202d506a60b9ad85daf0e8c453c86792ca4 (patch) | |
tree | a57ae32c1a0242bc78597894fd69b6306d907e55 | |
parent | af5c11d4727e7f623074ee26929021eb433ce485 (diff) | |
download | chef-c7f11202d506a60b9ad85daf0e8c453c86792ca4.tar.gz |
Bump version to 14.12.2 by Chef Expeditorv14.12.2
Obvious fix; these changes are the result of automation not creative thinking.
-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 f2f1922d0e..883e3d4322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.12.1 --> -## [v14.12.1](https://github.com/chef/chef/tree/v14.12.1) (2019-04-04) +<!-- latest_release 14.12.2 --> +## [v14.12.2](https://github.com/chef/chef/tree/v14.12.2) (2019-04-12) #### Merged Pull Requests -- Update Ruby to 2.5.5 and nokogiri to 1.10.2 [#8339](https://github.com/chef/chef/pull/8339) ([tas50](https://github.com/tas50)) +- Backport two test fixes/changes to chef-14 [#8364](https://github.com/chef/chef/pull/8364) ([btm](https://github.com/btm)) <!-- latest_release --> <!-- release_rollup since=14.11.21 --> ### Changes since 14.11.21 release #### Merged Pull Requests +- Backport two test fixes/changes to chef-14 [#8364](https://github.com/chef/chef/pull/8364) ([btm](https://github.com/btm)) <!-- 14.12.2 --> - Update Ruby to 2.5.5 and nokogiri to 1.10.2 [#8339](https://github.com/chef/chef/pull/8339) ([tas50](https://github.com/tas50)) <!-- 14.12.1 --> - Remove windows-api pin and update InSpec to 3.9.0 [#8327](https://github.com/chef/chef/pull/8327) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.12.0 --> - Remove travis gem dep and bump versions of multiple components [#8315](https://github.com/chef/chef/pull/8315) ([tas50](https://github.com/tas50)) <!-- 14.11.25 --> diff --git a/Gemfile.lock b/Gemfile.lock index 9c3a641e23..369d8c21cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.12.1) + chef (14.12.2) addressable bundler (>= 1.10) - chef-config (= 14.12.1) + chef-config (= 14.12.2) 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.12.1-universal-mingw32) + chef (14.12.2-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.12.1) + chef-config (= 14.12.2) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -77,7 +77,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.12.1) + chef-config (14.12.2) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.12.1
\ No newline at end of file +14.12.2
\ 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 5bee2c3bb1..5144e1988c 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.12.1".freeze + VERSION = "14.12.2".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b7ccc29ee7..8e2118c6ce 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.12.1") + VERSION = Chef::VersionString.new("14.12.2") end # |