summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-27 01:52:38 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-27 01:52:38 +0000
commit62e354ff5c06f9207c5988ef4baccfd3478552ce (patch)
treeba272c215ad3d4253fa87a2eaf447cea612e2147
parent944651f6d59580b732720e48e4fc5594a60e2d61 (diff)
downloadchef-62e354ff5c06f9207c5988ef4baccfd3478552ce.tar.gz
Bump version to 15.0.7 by Chef Expeditorv15.0.7
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 e1273df4fc..3665467469 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.6 -->
-## [v15.0.6](https://github.com/chef/chef/tree/v15.0.6) (2018-10-27)
+<!-- latest_release 15.0.7 -->
+## [v15.0.7](https://github.com/chef/chef/tree/v15.0.7) (2018-10-27)
#### 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))
+- shell_out auto-timeout still needs to be restricted to only providers [#7793](https://github.com/chef/chef/pull/7793) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- shell_out auto-timeout still needs to be restricted to only providers [#7793](https://github.com/chef/chef/pull/7793) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.7 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 37358530a5..27f801e2c9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.6)
+ chef (15.0.7)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.6)
+ chef-config (= 15.0.7)
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.6-universal-mingw32)
+ chef (15.0.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.6)
+ chef-config (= 15.0.7)
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.6)
+ chef-config (15.0.7)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 8dd97747d6..38fb5545b0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.6 \ No newline at end of file
+15.0.7 \ 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 07d0f4e81d..ac3886a38b 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.6".freeze
+ VERSION = "15.0.7".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 364dcb747c..e85c65c741 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.6")
+ VERSION = Chef::VersionString.new("15.0.7")
end
#