diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-10-16 08:28:07 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-10-16 08:28:07 +0000 |
commit | f0085ff663c8857ef9d0aef08ee9c4b74ebd8946 (patch) | |
tree | 9bf88cfc9c3dcd3d807ede6d5c0a8f96d39d7627 | |
parent | 283cdc1e0fc4e470c40f9764d856a1ad6d1032d4 (diff) | |
download | chef-f0085ff663c8857ef9d0aef08ee9c4b74ebd8946.tar.gz |
Bump version to 14.6.28 by Chef Expeditorv14.6.28
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 12 | ||||
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e2eed7a81..772b6662e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.6.27 --> -## [v14.6.27](https://github.com/chef/chef/tree/v14.6.27) (2018-10-15) +<!-- latest_release 14.6.28 --> +## [v14.6.28](https://github.com/chef/chef/tree/v14.6.28) (2018-10-16) #### Merged Pull Requests -- Update Nokogiri to 1.8.5 [#7750](https://github.com/chef/chef/pull/7750) ([tas50](https://github.com/tas50)) +- Node Attributes: Build ImmutableMash properly in deep_merge! [#7752](https://github.com/chef/chef/pull/7752) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=14.5.33 --> ### Changes since 14.5.33 release #### Merged Pull Requests +- Node Attributes: Build ImmutableMash properly in deep_merge! [#7752](https://github.com/chef/chef/pull/7752) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.6.28 --> - Update Nokogiri to 1.8.5 [#7750](https://github.com/chef/chef/pull/7750) ([tas50](https://github.com/tas50)) <!-- 14.6.27 --> - Update omnibus deps [#7749](https://github.com/chef/chef/pull/7749) ([tas50](https://github.com/tas50)) <!-- 14.6.26 --> - Bump inspec-core to 2.3.24 [#7748](https://github.com/chef/chef/pull/7748) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.25 --> diff --git a/Gemfile.lock b/Gemfile.lock index f11adf6fa3..c46afcd4ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.6.27) + chef (14.6.28) addressable bundler (>= 1.10) - chef-config (= 14.6.27) + chef-config (= 14.6.28) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.6.27-universal-mingw32) + chef (14.6.28-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.6.27) + chef-config (= 14.6.28) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.6.27) + chef-config (14.6.28) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -176,7 +176,7 @@ GEM addressable (~> 2.3) libyajl2 (1.2.0) method_source (0.9.0) - mixlib-archive (0.4.16) + mixlib-archive (0.4.18) mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) @@ -1 +1 @@ -14.6.27
\ No newline at end of file +14.6.28
\ 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 06a9e9a926..102f4d87b0 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.6.27".freeze + VERSION = "14.6.28".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3e1e46da67..29c27bc499 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.6.27") + VERSION = Chef::VersionString.new("14.6.28") end # |