summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-03-24 23:37:57 +0000
committerChef Expeditor <expeditor@chef.io>2020-03-24 23:37:57 +0000
commitedee47b2b709578eafd187a527f228a8a4dc00a4 (patch)
tree9802e3994c1f5c4bc82ce5eb7d38275b0440e554
parentb5f2ad74ef46c46cebcb0dded8c78b9c0a72b279 (diff)
downloadchef-edee47b2b709578eafd187a527f228a8a4dc00a4.tar.gz
Bump version to 15.9.2 by Chef Expeditorv15.9.2
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-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, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6158a70f6..ebae0a3f7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.9.1 -->
-## [v15.9.1](https://github.com/chef/chef/tree/v15.9.1) (2020-03-16)
+<!-- latest_release 15.9.2 -->
+## [v15.9.2](https://github.com/chef/chef/tree/v15.9.2) (2020-03-24)
#### Merged Pull Requests
-- Backport more testing improvements from master [#9504](https://github.com/chef/chef/pull/9504) ([tas50](https://github.com/tas50))
+- Backport rhsm_register resource :https_for_ca_consumer property [#9530](https://github.com/chef/chef/pull/9530) ([jasonwbarnett](https://github.com/jasonwbarnett))
<!-- latest_release -->
<!-- release_rollup since=15.8.23 -->
### Changes not yet released to stable channel
#### Merged Pull Requests
+- Backport rhsm_register resource :https_for_ca_consumer property [#9530](https://github.com/chef/chef/pull/9530) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.9.2 -->
- Backport more testing improvements from master [#9504](https://github.com/chef/chef/pull/9504) ([tas50](https://github.com/tas50)) <!-- 15.9.1 -->
- Update InSpec 4.18.100, Ohai to 15.8, and Fauxhai to 8 [#9503](https://github.com/chef/chef/pull/9503) ([tas50](https://github.com/tas50)) <!-- 15.9.0 -->
- Chefstyle fixes identified with Rubocop 0.80 [#9502](https://github.com/chef/chef/pull/9502) ([tas50](https://github.com/tas50)) <!-- 15.8.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index b110c698c1..813039aa8b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.9.1)
+ chef (15.9.2)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.1)
- chef-utils (= 15.9.1)
+ chef-config (= 15.9.2)
+ chef-utils (= 15.9.2)
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.9.1-universal-mingw32)
+ chef (15.9.2-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.1)
- chef-utils (= 15.9.1)
+ chef-config (= 15.9.2)
+ chef-utils (= 15.9.2)
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.9.1)
- chef (= 15.9.1)
+ chef-bin (15.9.2)
+ chef (= 15.9.2)
PATH
remote: chef-config
specs:
- chef-config (15.9.1)
+ chef-config (15.9.2)
addressable
- chef-utils (= 15.9.1)
+ chef-utils (= 15.9.2)
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.9.1)
+ chef-utils (15.9.2)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index c74a170d6d..92a80da0f6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.1 \ No newline at end of file
+15.9.2 \ 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 6ca38b636b..31166e7281 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.9.1".freeze
+ VERSION = "15.9.2".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 304f7334b5..01c4ca92ac 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.9.1".freeze
+ VERSION = "15.9.2".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 0faa4b5db4..ae3da8a65c 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.9.1".freeze
+ VERSION = "15.9.2".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 49bf70d64c..81672b5468 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.9.1")
+ VERSION = Chef::VersionString.new("15.9.2")
end
#