diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-09-29 16:57:55 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-09-29 16:57:55 +0000 |
commit | 51393c5ffabc99f5aab0dfacfdff54cfb8322624 (patch) | |
tree | d15f5f8476aecae70b677e663b6ef57f426b30f3 | |
parent | a5a005e844b20faf877d38da889c8ff9470893b8 (diff) | |
download | chef-13.5.4.tar.gz |
Bump version to 13.5.4 by Chef Expeditorv13.5.4
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6faf6faa1f..cb37bc5200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.4.36 --> -## [v13.4.36](https://github.com/chef/chef/tree/v13.4.36) (2017-09-27) +<!-- latest_release 13.5.4 --> +## [v13.5.4](https://github.com/chef/chef/tree/v13.5.4) (2017-09-29) #### Merged Pull Requests -- fix password property is sensitive for mount resource [#6442](https://github.com/chef/chef/pull/6442) ([dimsh99](https://github.com/dimsh99)) +- only warn about skipping sync once [#6454](https://github.com/chef/chef/pull/6454) ([Happycoil](https://github.com/Happycoil)) <!-- latest_release --> <!-- release_rollup since=12.21.14 --> ### Changes since 12.21.14 release #### Merged Pull Requests +- only warn about skipping sync once [#6454](https://github.com/chef/chef/pull/6454) ([Happycoil](https://github.com/Happycoil)) <!-- 13.5.4 --> - Replace which apt-get check with simple debian check in apt resources [#6409](https://github.com/chef/chef/pull/6409) ([tas50](https://github.com/tas50)) <!-- 13.4.25 --> - Quiet the output of the zypper refresh and add force [#6408](https://github.com/chef/chef/pull/6408) ([tas50](https://github.com/tas50)) <!-- 13.4.26 --> - Remove unused requires in yum_repository [#6413](https://github.com/chef/chef/pull/6413) ([tas50](https://github.com/tas50)) <!-- 13.4.27 --> @@ -1598,4 +1599,4 @@ of partial templates. * Fixed a bug where nested resources that inherited from Resource::LWRPBase would not share the same actions/default_action as their parent * Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional) -* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) +* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index b845746a06..890a6093ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.5.3) + chef (13.5.4) addressable bundler (>= 1.10) - chef-config (= 13.5.3) + chef-config (= 13.5.4) 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.5.3-universal-mingw32) + chef (13.5.4-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.5.3) + chef-config (= 13.5.4) 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.5.3) + chef-config (13.5.4) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.5.3
\ No newline at end of file +13.5.4
\ 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 5b585c851d..7bdf1b18f8 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.5.3" + VERSION = "13.5.4" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ccdc73a90a..b58687a918 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.5.3") + VERSION = Chef::VersionString.new("13.5.4") end # |