summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-10 16:53:07 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-10 16:53:07 +0000
commit87a613bbc2603dab378cef904b749a1978cf9c74 (patch)
tree07c8bc39ca330238b7b76818e9c98a4e8493acaf
parent60de42eb8d102beb1fc9ffdfb2ce38658f8427d5 (diff)
downloadchef-87a613bbc2603dab378cef904b749a1978cf9c74.tar.gz
Bump version to 13.3.37 by Chef Expeditorv13.3.37
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 778b6ade32..39196c9d0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,15 @@
-<!-- latest_release 13.3.36 -->
-## [v13.3.36](https://github.com/chef/chef/tree/v13.3.36) (2017-08-09)
+<!-- latest_release 13.3.37 -->
+## [v13.3.37](https://github.com/chef/chef/tree/v13.3.37) (2017-08-10)
#### Merged Pull Requests
-- throw readable errors if multiple dsc resources are found [#6307](https://github.com/chef/chef/pull/6307) ([Happycoil](https://github.com/Happycoil))
+- Add zypper_repository resource [#5948](https://github.com/chef/chef/pull/5948) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.2.20 -->
### Changes since 13.2.20 release
#### Merged Pull Requests
+- Add zypper_repository resource [#5948](https://github.com/chef/chef/pull/5948) ([tas50](https://github.com/tas50)) <!-- 13.3.37 -->
- throw readable errors if multiple dsc resources are found [#6307](https://github.com/chef/chef/pull/6307) ([Happycoil](https://github.com/Happycoil)) <!-- 13.3.36 -->
- Bump omnibus-software version [#6310](https://github.com/chef/chef/pull/6310) ([thommay](https://github.com/thommay)) <!-- 13.3.35 -->
- add option to enable unprivileged symlink creation on windows [#6236](https://github.com/chef/chef/pull/6236) ([svmastersamurai](https://github.com/svmastersamurai)) <!-- 13.3.34 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 451a466172..3efd5b3964 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.3.36)
+ chef (13.3.37)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.36)
+ chef-config (= 13.3.37)
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.36-universal-mingw32)
+ chef (13.3.37-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.3.36)
+ chef-config (= 13.3.37)
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.36)
+ chef-config (13.3.37)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -300,7 +300,7 @@ GEM
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
semverse (2.0.0)
- serverspec (2.39.2)
+ serverspec (2.40.0)
multi_json
rspec (~> 3.0)
rspec-its
diff --git a/VERSION b/VERSION
index 77e4d508d7..281e569059 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.3.36 \ No newline at end of file
+13.3.37 \ 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 00002fbe9b..555351a326 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.36"
+ VERSION = "13.3.37"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 21724c60ed..fa9879c472 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.36")
+ VERSION = Chef::VersionString.new("13.3.37")
end
#