summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-09 16:18:08 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-09 16:18:08 +0000
commit2894585a40fbec06a5ff224ad579ff7194833aa2 (patch)
tree48af6ef8083a4ce842cd5904b460f27477d73baa
parent35ed91107e38f3fdfc50e7e054a8343e25545534 (diff)
downloadchef-2894585a40fbec06a5ff224ad579ff7194833aa2.tar.gz
Bump version to 13.5.15 by Chef Expeditorv13.5.15
-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 2587c17420..56c3d8c031 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.5.14 -->
-## [v13.5.14](https://github.com/chef/chef/tree/v13.5.14) (2017-10-06)
+<!-- latest_release 13.5.15 -->
+## [v13.5.15](https://github.com/chef/chef/tree/v13.5.15) (2017-10-09)
#### Merged Pull Requests
-- Add allow_downgrade to zypper_package resource [#6476](https://github.com/chef/chef/pull/6476) ([yeoldegrove](https://github.com/yeoldegrove))
+- [SUSTAIN-731] Don&#39;t spin in powershell module that launches chef processes [#6481](https://github.com/chef/chef/pull/6481) ([ksubrama](https://github.com/ksubrama))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- [SUSTAIN-731] Don&#39;t spin in powershell module that launches chef processes [#6481](https://github.com/chef/chef/pull/6481) ([ksubrama](https://github.com/ksubrama)) <!-- 13.5.15 -->
- Add allow_downgrade to zypper_package resource [#6476](https://github.com/chef/chef/pull/6476) ([yeoldegrove](https://github.com/yeoldegrove)) <!-- 13.5.14 -->
- Remove cookbook_artifacts from CHEF_11_OSS_STATIC_OBJECTS [#6478](https://github.com/chef/chef/pull/6478) ([itmustbejj](https://github.com/itmustbejj)) <!-- 13.5.13 -->
- Prevent creation of data bags named node, role, client or environment [#6469](https://github.com/chef/chef/pull/6469) ([sanditiffin](https://github.com/sanditiffin)) <!-- 13.5.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bfaffe446d..76f8c60abc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.14)
+ chef (13.5.15)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.14)
+ chef-config (= 13.5.15)
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.14-universal-mingw32)
+ chef (13.5.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.14)
+ chef-config (= 13.5.15)
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.14)
+ chef-config (13.5.15)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index f02307599c..e3bdada3c7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.14 \ No newline at end of file
+13.5.15 \ 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 53c2545e3b..f276cf826b 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.14"
+ VERSION = "13.5.15"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 21c443aa8e..0d073160af 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.14")
+ VERSION = Chef::VersionString.new("13.5.15")
end
#