summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-27 22:02:45 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-27 22:02:45 +0000
commitca777b8d442c29aa7322e98eb8c3feb4f4c84936 (patch)
tree79c0ffe483b0140e1ecf6dc0f7a43dd4ea53a8d9
parent467df6c1aa5e50565e099b98797f1c1fff193067 (diff)
downloadchef-ca777b8d442c29aa7322e98eb8c3feb4f4c84936.tar.gz
Bump version to 13.6.17 by Expeditorv13.6.17
-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 d2b81d7e87..8fd1bb1815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.16 -->
-## [v13.6.16](https://github.com/chef/chef/tree/v13.6.16) (2017-11-27)
+<!-- latest_release 13.6.17 -->
+## [v13.6.17](https://github.com/chef/chef/tree/v13.6.17) (2017-11-27)
#### Merged Pull Requests
-- Makes life easier for hook authors switching from the older report handler syntax [#6574](https://github.com/chef/chef/pull/6574) ([coderanger](https://github.com/coderanger))
+- Only warn if a secret was actually given [#6605](https://github.com/chef/chef/pull/6605) ([coderanger](https://github.com/coderanger))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Only warn if a secret was actually given [#6605](https://github.com/chef/chef/pull/6605) ([coderanger](https://github.com/coderanger)) <!-- 13.6.17 -->
- Makes life easier for hook authors switching from the older report handler syntax [#6574](https://github.com/chef/chef/pull/6574) ([coderanger](https://github.com/coderanger)) <!-- 13.6.16 -->
- [MSYS-688] Fixed invalid date and Invalid starttime error [#6544](https://github.com/chef/chef/pull/6544) ([NimishaS](https://github.com/NimishaS)) <!-- 13.6.15 -->
- Selinux shellout fix (#6346) [#6567](https://github.com/chef/chef/pull/6567) ([deltamualpha](https://github.com/deltamualpha)) <!-- 13.6.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 55ad168d9a..6b32e1c93d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.16)
+ chef (13.6.17)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.16)
+ chef-config (= 13.6.17)
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.6.16-universal-mingw32)
+ chef (13.6.17-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.16)
+ chef-config (= 13.6.17)
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.6.16)
+ chef-config (13.6.17)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 7cf816f5e5..0f2711b72a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.16 \ No newline at end of file
+13.6.17 \ 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 3c496c685a..d63d24efbf 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.6.16"
+ VERSION = "13.6.17"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a2c171f7b5..492da224c5 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.6.16")
+ VERSION = Chef::VersionString.new("13.6.17")
end
#