diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-25 22:07:29 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-25 22:07:29 +0000 |
commit | 4e3d0be338298207c81360840488e4241e72ce4a (patch) | |
tree | 679d3aed5597b3245729ed408eb25b09ea755054 | |
parent | 9566576a9502550878c3a089345e778d1b84430c (diff) | |
download | chef-4e3d0be338298207c81360840488e4241e72ce4a.tar.gz |
Bump version to 13.7.18 by Expeditorv13.7.18
-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 3382346747..ad73df6de6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.7.17 --> -## [v13.7.17](https://github.com/chef/chef/tree/v13.7.17) (2018-01-24) +<!-- latest_release 13.7.18 --> +## [v13.7.18](https://github.com/chef/chef/tree/v13.7.18) (2018-01-25) #### Merged Pull Requests -- Fix regression where message isn't an identity property in log resource [#6780](https://github.com/chef/chef/pull/6780) ([tas50](https://github.com/tas50)) +- fix node assignment of ImmutableArrays to VividMashes/AttrArrays (Chef-13 backport) [#6791](https://github.com/chef/chef/pull/6791) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- fix node assignment of ImmutableArrays to VividMashes/AttrArrays (Chef-13 backport) [#6791](https://github.com/chef/chef/pull/6791) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.7.18 --> - Fix regression where message isn't an identity property in log resource [#6780](https://github.com/chef/chef/pull/6780) ([tas50](https://github.com/tas50)) <!-- 13.7.17 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 4966381aec..894074822e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.7.17) + chef (13.7.18) addressable bundler (>= 1.10) - chef-config (= 13.7.17) + chef-config (= 13.7.18) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -47,10 +47,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.7.17-universal-mingw32) + chef (13.7.18-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.7.17) + chef-config (= 13.7.18) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.7.17) + chef-config (13.7.18) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.7.17
\ No newline at end of file +13.7.18
\ 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 b214c4f7db..2f8ffbf518 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 = "13.7.17" + VERSION = "13.7.18" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 4899a2d607..bc38ca9cee 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("13.7.17") + VERSION = Chef::VersionString.new("13.7.18") end # |