diff options
-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 86daf930bf..8d90f395a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.1.5 --> -## [v14.1.5](https://github.com/chef/chef/tree/v14.1.5) (2018-05-11) +<!-- latest_release 14.1.6 --> +## [v14.1.6](https://github.com/chef/chef/tree/v14.1.6) (2018-05-14) #### Merged Pull Requests -- repo_name property should be part of new_resource object [#7252](https://github.com/chef/chef/pull/7252) ([tj-anderson](https://github.com/tj-anderson)) +- remote_directory: restore overwrite default [#7254](https://github.com/chef/chef/pull/7254) ([rmoriz](https://github.com/rmoriz)) <!-- latest_release --> <!-- release_rollup since=14.1.1 --> ### Changes since 14.1.1 release #### Merged Pull Requests +- remote_directory: restore overwrite default [#7254](https://github.com/chef/chef/pull/7254) ([rmoriz](https://github.com/rmoriz)) <!-- 14.1.6 --> - repo_name property should be part of new_resource object [#7252](https://github.com/chef/chef/pull/7252) ([tj-anderson](https://github.com/tj-anderson)) <!-- 14.1.5 --> - fix git provider: -prune-tags is not available with old git versions, fixes #7233 [#7247](https://github.com/chef/chef/pull/7247) ([rmoriz](https://github.com/rmoriz)) <!-- 14.1.4 --> - Switch Node#role? to use the attributes expansion instead of the run list [#7234](https://github.com/chef/chef/pull/7234) ([coderanger](https://github.com/coderanger)) <!-- 14.1.3 --> diff --git a/Gemfile.lock b/Gemfile.lock index 6461d19d16..c981b1c826 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GIT PATH remote: . specs: - chef (14.1.5) + chef (14.1.6) addressable bundler (>= 1.10) - chef-config (= 14.1.5) + chef-config (= 14.1.6) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -46,10 +46,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.1.5-universal-mingw32) + chef (14.1.6-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.1.5) + chef-config (= 14.1.6) 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 (14.1.5) + chef-config (14.1.6) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.1.5
\ No newline at end of file +14.1.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 30fc7592ba..f4f253c9de 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.1.5" + VERSION = "14.1.6" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index c76a7c11d8..f19b819981 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.1.5") + VERSION = Chef::VersionString.new("14.1.6") end # |