summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-27 00:31:19 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-27 00:31:19 +0000
commite695014e818d8ef9bbfbd3157f9973c412580431 (patch)
tree1762220367edba52b271ee3ae37a9af46fbbc72b
parent52c7265008ee36cc8cc064a829961b6fc25e6585 (diff)
downloadchef-e695014e818d8ef9bbfbd3157f9973c412580431.tar.gz
Bump version to 15.0.6 by Chef Expeditorv15.0.6
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 fba63454b5..e1273df4fc 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.5 -->
-## [v15.0.5](https://github.com/chef/chef/tree/v15.0.5) (2018-10-26)
+<!-- latest_release 15.0.6 -->
+## [v15.0.6](https://github.com/chef/chef/tree/v15.0.6) (2018-10-27)
#### Merged Pull Requests
-- Remove legacy require_recipe DSL method [#7790](https://github.com/chef/chef/pull/7790) ([tas50](https://github.com/tas50))
+- Remove cookbook merging/shadowing from the cookbooker loader [#7792](https://github.com/chef/chef/pull/7792) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Remove cookbook merging/shadowing from the cookbooker loader [#7792](https://github.com/chef/chef/pull/7792) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.6 -->
- Remove legacy require_recipe DSL method [#7790](https://github.com/chef/chef/pull/7790) ([tas50](https://github.com/tas50)) <!-- 15.0.5 -->
- Do the shell_out deprecations for Chef-15. [#7788](https://github.com/chef/chef/pull/7788) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.4 -->
- Update description fields from the docs site [#7784](https://github.com/chef/chef/pull/7784) ([tas50](https://github.com/tas50)) <!-- 15.0.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0db4a26e92..37358530a5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.5)
+ chef (15.0.6)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.5)
+ chef-config (= 15.0.6)
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.5-universal-mingw32)
+ chef (15.0.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.5)
+ chef-config (= 15.0.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -103,7 +103,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.5)
+ chef-config (15.0.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 8fc2ffdd13..8dd97747d6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.5 \ No newline at end of file
+15.0.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 e34ff36595..07d0f4e81d 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.5".freeze
+ VERSION = "15.0.6".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a8ec784fba..364dcb747c 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.5")
+ VERSION = Chef::VersionString.new("15.0.6")
end
#