summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 f3a6b7c52b..37cadcc9ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release 13.3.39 -->
-## [v13.3.39](https://github.com/chef/chef/tree/v13.3.39) (2017-08-11)
+<!-- latest_release 13.3.40 -->
+## [v13.3.40](https://github.com/chef/chef/tree/v13.3.40) (2017-08-11)
#### Merged Pull Requests
-- Pull in Ohai 13.3 [#6319](https://github.com/chef/chef/pull/6319) ([tas50](https://github.com/tas50))
+- Maintain compat with old zypper_repo resource used in cookbooks [#6318](https://github.com/chef/chef/pull/6318) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Maintain compat with old zypper_repo resource used in cookbooks [#6318](https://github.com/chef/chef/pull/6318) ([tas50](https://github.com/tas50)) <!-- 13.3.40 -->
- Pull in Ohai 13.3 [#6319](https://github.com/chef/chef/pull/6319) ([tas50](https://github.com/tas50)) <!-- 13.3.39 -->
- Add release notes for 13.3 [#6317](https://github.com/chef/chef/pull/6317) ([tas50](https://github.com/tas50)) <!-- 13.3.38 -->
- Add zypper_repository resource [#5948](https://github.com/chef/chef/pull/5948) ([tas50](https://github.com/tas50)) <!-- 13.3.37 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e216c53238..badf45dba9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.39)
+ chef (13.3.40)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.39)
+ chef-config (= 13.3.40)
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.3.39-universal-mingw32)
+ chef (13.3.40-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.39)
+ chef-config (= 13.3.40)
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.3.39)
+ chef-config (13.3.40)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e5015a5a5a..671d30fe99 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.39 \ No newline at end of file
+13.3.40 \ 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 af64840d80..bcb90f4c85 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -20,7 +20,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.3.39"
+ VERSION = "13.3.40"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8f404b6a06..d3158134b7 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -22,7 +22,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.3.39")
+ VERSION = Chef::VersionString.new("13.3.40")
end
#