summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md6
-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, 18 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b5be8a391..2e38638d83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,11 @@
This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
-<!-- latest_release unreleased -->
-## Unreleased
+<!-- latest_release 15.15.2 -->
+## [v15.15.2](https://github.com/chef/chef/tree/v15.15.2) (2021-03-25)
#### Merged Pull Requests
+- Use Ruby 2.6.6 in the version script instead [#11236](https://github.com/chef/chef/pull/11236) ([tas50](https://github.com/tas50))
- Manually install necessary Ruby for verify pipeline [#10872](https://github.com/chef/chef/pull/10872) ([christopher-snapp](https://github.com/christopher-snapp))
<!-- latest_release -->
@@ -13,6 +14,7 @@ This changelog lists individual merged pull requests to Chef Infra Client and ge
### Changes not yet released to stable
#### Merged Pull Requests
+- Use Ruby 2.6.6 in the version script instead [#11236](https://github.com/chef/chef/pull/11236) ([tas50](https://github.com/tas50)) <!-- 15.15.2 -->
- Manually install necessary Ruby for verify pipeline [#10872](https://github.com/chef/chef/pull/10872) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.15.1 -->
- Make sure our containers work on RHEL 6 [#10855](https://github.com/chef/chef/pull/10855) ([tas50](https://github.com/tas50)) <!-- 15.15.1 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 261ae8e2a0..ab42b209f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,12 +19,12 @@ GIT
PATH
remote: .
specs:
- chef (15.15.1)
+ chef (15.15.2)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.15.1)
- chef-utils (= 15.15.1)
+ chef-config (= 15.15.2)
+ chef-utils (= 15.15.2)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -51,12 +51,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.15.1-universal-mingw32)
+ chef (15.15.2-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.15.1)
- chef-utils (= 15.15.1)
+ chef-config (= 15.15.2)
+ chef-utils (= 15.15.2)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -99,15 +99,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.15.1)
- chef (= 15.15.1)
+ chef-bin (15.15.2)
+ chef (= 15.15.2)
PATH
remote: chef-config
specs:
- chef-config (15.15.1)
+ chef-config (15.15.2)
addressable
- chef-utils (= 15.15.1)
+ chef-utils (= 15.15.2)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -116,7 +116,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.15.1)
+ chef-utils (15.15.2)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 62cead3fab..5ebdb93b37 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.15.1 \ No newline at end of file
+15.15.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 7344db8a9a..cfe63f273a 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("..", __dir__)
- VERSION = "15.15.1".freeze
+ VERSION = "15.15.2".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index b1dc6961c7..b9160402a5 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("..", __dir__)
- VERSION = "15.15.1".freeze
+ VERSION = "15.15.2".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 09b8d29b1d..30cfce86f9 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("..", __dir__)
- VERSION = "15.15.1".freeze
+ VERSION = "15.15.2".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index eaf228e2aa..2af73f6b08 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("..", __dir__)
- VERSION = Chef::VersionString.new("15.15.1")
+ VERSION = Chef::VersionString.new("15.15.2")
end
#