summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 339154fcf5..9b06039592 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.2.32 -->
-## [v15.2.32](https://github.com/chef/chef/tree/v15.2.32) (2019-08-29)
+<!-- latest_release 15.2.33 -->
+## [v15.2.33](https://github.com/chef/chef/tree/v15.2.33) (2019-08-29)
#### Merged Pull Requests
-- remove app_server_support spec file [#8852](https://github.com/chef/chef/pull/8852) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update InSpec to 4.12 and Train to 3.0 [#8854](https://github.com/chef/chef/pull/8854) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.2.20 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update InSpec to 4.12 and Train to 3.0 [#8854](https://github.com/chef/chef/pull/8854) ([tas50](https://github.com/tas50)) <!-- 15.2.33 -->
- remove app_server_support spec file [#8852](https://github.com/chef/chef/pull/8852) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.32 -->
- Fix node[:cookbooks] attribute [#8846](https://github.com/chef/chef/pull/8846) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.31 -->
- Fail on interval runs on windows as interval runs on Windows don&#39;t entirely work [#6777](https://github.com/chef/chef/pull/6777) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.2.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 60b30747eb..197cbdb6a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.2.32)
+ chef (15.2.33)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.32)
+ chef-config (= 15.2.33)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
train-winrm
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.2.32-universal-mingw32)
+ chef (15.2.33-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.2.32)
+ chef-config (= 15.2.33)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.2.32)
- chef (= 15.2.32)
+ chef-bin (15.2.33)
+ chef (= 15.2.33)
PATH
remote: chef-config
specs:
- chef-config (15.2.32)
+ chef-config (15.2.33)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 0cc00dac8f..75a79e8cee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.32 \ No newline at end of file
+15.2.33 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 0ae8474fe2..d27bbc5507 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.2.32".freeze
+ VERSION = "15.2.33".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3913f80244..ef7014daf3 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 = "15.2.32".freeze
+ VERSION = "15.2.33".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 30d285e2ba..238143495b 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.2.32")
+ VERSION = Chef::VersionString.new("15.2.33")
end
#