diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-04-19 19:00:20 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-04-19 19:00:20 +0000 |
commit | 4ff9886fe012febe8432dccb485221dbed154ccf (patch) | |
tree | ae5d4ab5650f327f56178315d456162f9a65d236 | |
parent | 7c10725498ba884122b33bf8986fae921a8c5f4c (diff) | |
download | chef-4ff9886fe012febe8432dccb485221dbed154ccf.tar.gz |
Bump version to 14.12.6 by Chef Expeditorv14.12.6
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 dc1519f615..8e1333d844 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.5 --> -## [v14.12.5](https://github.com/chef/chef/tree/v14.12.5) (2019-04-17) +<!-- latest_release 14.12.6 --> +## [v14.12.6](https://github.com/chef/chef/tree/v14.12.6) (2019-04-19) #### Merged Pull Requests -- Update win32-service + bump inspec to 3.9.3 [#8387](https://github.com/chef/chef/pull/8387) ([tas50](https://github.com/tas50)) +- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.12.3 --> ### Changes since 14.12.3 release #### Merged Pull Requests +- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50)) <!-- 14.12.6 --> - Update win32-service + bump inspec to 3.9.3 [#8387](https://github.com/chef/chef/pull/8387) ([tas50](https://github.com/tas50)) <!-- 14.12.5 --> - Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm)) <!-- 14.12.4 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 4893f4c261..ac674ef364 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.12.5) + chef (14.12.6) addressable bundler (>= 1.10) - chef-config (= 14.12.5) + chef-config (= 14.12.6) 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.5-universal-mingw32) + chef (14.12.6-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.12.5) + chef-config (= 14.12.6) 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.5) + chef-config (14.12.6) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.12.5
\ No newline at end of file +14.12.6
\ 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 b9b81e895b..4076ab99d2 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.5".freeze + VERSION = "14.12.6".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ad5a99acd1..118ec50e7f 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.5") + VERSION = Chef::VersionString.new("14.12.6") end # |