summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-01-27 20:09:53 +0000
committerChef Expeditor <expeditor@chef.io>2020-01-27 20:09:53 +0000
commit28fb424296938d3efa806f1655afc9ef96c8207f (patch)
treef810c44d87b565671787fc2dd873b1fddc27db28
parentdcca8e79144a18689e93a303508f8a301e9d71c9 (diff)
downloadchef-28fb424296938d3efa806f1655afc9ef96c8207f.tar.gz
Bump version to 15.7.32 by Chef Expeditorv15.7.32
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock22
-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--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 26 insertions, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 037b2ded36..c22f3fb615 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 15.7.32 -->
+## [v15.7.32](https://github.com/chef/chef/tree/v15.7.32) (2020-01-27)
+
+#### Merged Pull Requests
+- Chef 15 backport of #9281 and #9274 [#9283](https://github.com/chef/chef/pull/9283) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.7.31 -->
+### Changes not yet released to stable channel
+
+#### Merged Pull Requests
+- Chef 15 backport of #9281 and #9274 [#9283](https://github.com/chef/chef/pull/9283) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.7.32 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 43821953a2..204abe7f4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.7.31)
+ chef (15.7.32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.31)
- chef-utils (= 15.7.31)
+ chef-config (= 15.7.32)
+ chef-utils (= 15.7.32)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.7.31-universal-mingw32)
+ chef (15.7.32-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.7.31)
- chef-utils (= 15.7.31)
+ chef-config (= 15.7.32)
+ chef-utils (= 15.7.32)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.7.31)
- chef (= 15.7.31)
+ chef-bin (15.7.32)
+ chef (= 15.7.32)
PATH
remote: chef-config
specs:
- chef-config (15.7.31)
+ chef-config (15.7.32)
addressable
- chef-utils (= 15.7.31)
+ chef-utils (= 15.7.32)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.7.31)
+ chef-utils (15.7.32)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index b02bad5fce..bf3a8b8ea5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.7.31 \ No newline at end of file
+15.7.32 \ 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 eec73fbdac..e9851a2fee 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.7.31".freeze
+ VERSION = "15.7.32".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 0f7e4c04cd..ffb265d156 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.7.31".freeze
+ VERSION = "15.7.32".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index f78e407a16..c78686eb0f 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.7.31".freeze
+ VERSION = "15.7.32".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 18b58f1db3..6a9cceefd8 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.7.31")
+ VERSION = Chef::VersionString.new("15.7.32")
end
#