summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-03 18:37:36 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-03 18:37:36 +0000
commitc39921025ac79db1448244c8cf69b810d38ea31b (patch)
tree0a9e49db53a547ba8c434eb3d18bbde229c17ef7
parent92212e72d70e5be7c46fd4e0e763a0b4720e94c1 (diff)
downloadchef-c39921025ac79db1448244c8cf69b810d38ea31b.tar.gz
Bump version to 13.5.7 by Chef Expeditorv13.5.7
-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 0055ec92a3..a471e7b79c 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.6 -->
-## [v13.5.6](https://github.com/chef/chef/tree/v13.5.6) (2017-09-29)
+<!-- latest_release 13.5.7 -->
+## [v13.5.7](https://github.com/chef/chef/tree/v13.5.7) (2017-10-03)
#### Merged Pull Requests
-- Bump InSpec to v1.40.0 [#6460](https://github.com/chef/chef/pull/6460) ([adamleff](https://github.com/adamleff))
+- Import the zypper GPG key before templating the repo [#6410](https://github.com/chef/chef/pull/6410) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- Import the zypper GPG key before templating the repo [#6410](https://github.com/chef/chef/pull/6410) ([tas50](https://github.com/tas50)) <!-- 13.5.7 -->
- only warn about skipping sync once [#6454](https://github.com/chef/chef/pull/6454) ([Happycoil](https://github.com/Happycoil)) <!-- 13.5.4 -->
- Force encoding to UTF_8 in chef-shell to prevent failures [#6447](https://github.com/chef/chef/pull/6447) ([tas50](https://github.com/tas50)) <!-- 13.5.5 -->
- Bump InSpec to v1.40.0 [#6460](https://github.com/chef/chef/pull/6460) ([adamleff](https://github.com/adamleff)) <!-- 13.5.6 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ee88c25abc..a78e289032 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.6)
+ chef (13.5.7)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.6)
+ chef-config (= 13.5.7)
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.6-universal-mingw32)
+ chef (13.5.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.6)
+ chef-config (= 13.5.7)
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.6)
+ chef-config (13.5.7)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c50c58133e..a15cc5b937 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.6 \ No newline at end of file
+13.5.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 f144a36c63..e97667f1f3 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.6"
+ VERSION = "13.5.7"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 63fd85c63c..b16c29cfdf 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.6")
+ VERSION = Chef::VersionString.new("13.5.7")
end
#