summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-12 17:16:16 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-12 17:16:16 +0000
commitd4d6935dce8d423747ed05766385946ebeb7f9e1 (patch)
treebf35c7f6dbf2ce77251593f359d18a5a119a4935
parent9cb7e953f8e04d46fced6da87cba414c591c904c (diff)
downloadchef-d4d6935dce8d423747ed05766385946ebeb7f9e1.tar.gz
Bump version to 15.0.61 by Chef Expeditorv15.0.61
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65bc4ed58d..341f291db3 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.60 -->
-## [v15.0.60](https://github.com/chef/chef/tree/v15.0.60) (2018-11-10)
+<!-- latest_release 15.0.61 -->
+## [v15.0.61](https://github.com/chef/chef/tree/v15.0.61) (2018-11-12)
#### 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))
+- windows_feature: Move provider logic into the default of the install_method property [#7912](https://github.com/chef/chef/pull/7912) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- windows_feature: Move provider logic into the default of the install_method property [#7912](https://github.com/chef/chef/pull/7912) ([tas50](https://github.com/tas50)) <!-- 15.0.61 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 324afabb59..5ea8c5b251 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.60)
+ chef (15.0.61)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.60)
+ chef-config (= 15.0.61)
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.60-universal-mingw32)
+ chef (15.0.61-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.60)
+ chef-config (= 15.0.61)
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.60)
+ chef-config (15.0.61)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 65b2628ea1..ddc84b9040 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.60 \ No newline at end of file
+15.0.61 \ 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 3a1f438e26..e5ecbfda8b 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.60".freeze
+ VERSION = "15.0.61".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b9d2cce483..64a3fce237 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.60")
+ VERSION = Chef::VersionString.new("15.0.61")
end
#