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 4e7d01ac2b..04e681fb36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.32 -->
-## [v13.4.32](https://github.com/chef/chef/tree/v13.4.32) (2017-09-25)
+<!-- latest_release 13.4.33 -->
+## [v13.4.33](https://github.com/chef/chef/tree/v13.4.33) (2017-09-25)
#### Merged Pull Requests
-- Fix Knife search ID only option to actually filter result set [#6438](https://github.com/chef/chef/pull/6438) ([dimsh99](https://github.com/dimsh99))
+- update expeditor labels [#6432](https://github.com/chef/chef/pull/6432) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.4.24 -->
### Changes since 13.4.24 release
#### Merged Pull Requests
+- update expeditor labels [#6432](https://github.com/chef/chef/pull/6432) ([thommay](https://github.com/thommay)) <!-- 13.4.33 -->
- Fix Knife search ID only option to actually filter result set [#6438](https://github.com/chef/chef/pull/6438) ([dimsh99](https://github.com/dimsh99)) <!-- 13.4.32 -->
- Add throttle and metalink options to yum_repository [#6431](https://github.com/chef/chef/pull/6431) ([tas50](https://github.com/tas50)) <!-- 13.4.31 -->
- Update dokken integration testing: dokken images, updated cookbook, debian 9 [#6414](https://github.com/chef/chef/pull/6414) ([tas50](https://github.com/tas50)) <!-- 13.4.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 24caadc651..5f086dceea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.32)
+ chef (13.4.33)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.32)
+ chef-config (= 13.4.33)
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.4.32-universal-mingw32)
+ chef (13.4.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.32)
+ chef-config (= 13.4.33)
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.4.32)
+ chef-config (13.4.33)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 34b714bbad..c402902cc8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.32 \ No newline at end of file
+13.4.33 \ 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 34fed39286..509d76cf8c 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.4.32"
+ VERSION = "13.4.33"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1bdbbb843c..e30285d620 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.4.32")
+ VERSION = Chef::VersionString.new("13.4.33")
end
#