diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-11-10 02:43:20 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-11-10 02:43:20 +0000 |
commit | a97e5da2e9dc3218da8df80eb905013effc85ca9 (patch) | |
tree | de6d9d2665382f8b2e9618f7a6c88bb3b50dda6b | |
parent | 91b54ba5f3fbd949c9c1ecb898aca50b2076f960 (diff) | |
download | chef-a97e5da2e9dc3218da8df80eb905013effc85ca9.tar.gz |
Bump version to 15.0.60 by Chef Expeditorv15.0.60
Obvious fix; these changes are the result of automation not creative thinking.
-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 bd32e79601..65bc4ed58d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.0.59 --> -## [v15.0.59](https://github.com/chef/chef/tree/v15.0.59) (2018-11-10) +<!-- latest_release 15.0.60 --> +## [v15.0.60](https://github.com/chef/chef/tree/v15.0.60) (2018-11-10) #### Merged Pull Requests -- Update deps to bring in the new ca-certs [#7897](https://github.com/chef/chef/pull/7897) ([tas50](https://github.com/tas50)) +- Always run policy_file if a policy_file or policy_group exists [#7910](https://github.com/chef/chef/pull/7910) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup --> ### Changes since latest stable release #### Merged Pull Requests +- Always run policy_file if a policy_file or policy_group exists [#7910](https://github.com/chef/chef/pull/7910) ([tas50](https://github.com/tas50)) <!-- 15.0.60 --> - Update deps to bring in the new ca-certs [#7897](https://github.com/chef/chef/pull/7897) ([tas50](https://github.com/tas50)) <!-- 15.0.59 --> - Add nillability to attribute deep merging [#7892](https://github.com/chef/chef/pull/7892) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.58 --> - Make sure we define windows_task resource on *nix systems [#7903](https://github.com/chef/chef/pull/7903) ([tas50](https://github.com/tas50)) <!-- 15.0.56 --> diff --git a/Gemfile.lock b/Gemfile.lock index 3a08a2bd34..324afabb59 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (15.0.59) + chef (15.0.60) addressable bundler (>= 1.10) - chef-config (= 15.0.59) + chef-config (= 15.0.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -57,10 +57,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (15.0.59-universal-mingw32) + chef (15.0.60-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 15.0.59) + chef-config (= 15.0.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -104,7 +104,7 @@ PATH PATH remote: chef-config specs: - chef-config (15.0.59) + chef-config (15.0.60) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -15.0.59
\ No newline at end of file +15.0.60
\ 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 118f89bc62..3a1f438e26 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 = "15.0.59".freeze + VERSION = "15.0.60".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a9c7f7d69b..b9d2cce483 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("15.0.59") + VERSION = Chef::VersionString.new("15.0.60") end # |