diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-23 02:46:08 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-23 02:46:08 +0000 |
| commit | bc98db2fd24d75443d048a83ae1844eec7499507 (patch) | |
| tree | 30843bce719fc573d2e9fdb065aa0553a3996564 | |
| parent | 3c1e14a40b4fb381f794c212151176537888fa53 (diff) | |
| download | chef-bc98db2fd24d75443d048a83ae1844eec7499507.tar.gz | |
Bump version to 14.0.16 by Expeditorv14.0.16
| -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 d43a52bd66..8e117ee52c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.15 --> -## [v14.0.15](https://github.com/chef/chef/tree/v14.0.15) (2018-01-22) +<!-- latest_release 14.0.16 --> +## [v14.0.16](https://github.com/chef/chef/tree/v14.0.16) (2018-01-23) #### Merged Pull Requests -- Remove node.set and node.set_unless attribute levels [#6762](https://github.com/chef/chef/pull/6762) ([lamont-granquist](https://github.com/lamont-granquist)) +- Convert node map to last-writer-wins for ties [#6765](https://github.com/chef/chef/pull/6765) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Convert node map to last-writer-wins for ties [#6765](https://github.com/chef/chef/pull/6765) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.16 --> - Remove node.set and node.set_unless attribute levels [#6762](https://github.com/chef/chef/pull/6762) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.15 --> - Rename the OpenSSL mixin to avoid name conflicts [#6764](https://github.com/chef/chef/pull/6764) ([tas50](https://github.com/tas50)) <!-- 14.0.14 --> - Revert "add create and delete actions for windows_service" [#6763](https://github.com/chef/chef/pull/6763) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.13 --> diff --git a/Gemfile.lock b/Gemfile.lock index cce2b4fadb..235e17f53e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.15) + chef (14.0.16) addressable bundler (>= 1.10) - chef-config (= 14.0.15) + chef-config (= 14.0.16) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.15-universal-mingw32) + chef (14.0.16-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.15) + chef-config (= 14.0.16) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.15) + chef-config (14.0.16) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.15
\ No newline at end of file +14.0.16
\ 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 3e029a209d..0a3a6c7fa3 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.0.15" + VERSION = "14.0.16" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ae2ac100a4..97532a6741 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.0.15") + VERSION = Chef::VersionString.new("14.0.16") end # |