summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-03-25 17:09:29 +0000
committerChef Expeditor <chef-ci@chef.io>2021-03-25 17:09:29 +0000
commit996bae1260d730415424eb13d74ee67f1e0b89ef (patch)
tree5773517bdac418a7af7751f38ba332ebccdfd947
parentcb72078df793a4d62383f64faf3c49a68985427e (diff)
downloadchef-996bae1260d730415424eb13d74ee67f1e0b89ef.tar.gz
Bump version to 15.15.6 by Chef Expeditorv15.15.6
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 839e0fbc7d..fd6d81daf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,18 @@
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 15.15.5 -->
-## [v15.15.5](https://github.com/chef/chef/tree/v15.15.5) (2021-03-25)
+<!-- latest_release 15.15.6 -->
+## [v15.15.6](https://github.com/chef/chef/tree/v15.15.6) (2021-03-25)
#### Merged Pull Requests
-- Update libarchive to 3.5.1 [#11243](https://github.com/chef/chef/pull/11243) ([tas50](https://github.com/tas50))
+- Bump highline and remove duplicate deps [#11244](https://github.com/chef/chef/pull/11244) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.15.0 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Bump highline and remove duplicate deps [#11244](https://github.com/chef/chef/pull/11244) ([tas50](https://github.com/tas50)) <!-- 15.15.6 -->
- Update libarchive to 3.5.1 [#11243](https://github.com/chef/chef/pull/11243) ([tas50](https://github.com/tas50)) <!-- 15.15.5 -->
- Use Dobi for container building [#11242](https://github.com/chef/chef/pull/11242) ([tas50](https://github.com/tas50)) <!-- 15.15.4 -->
- Update gem pins to better match changes in chef 16 [#11237](https://github.com/chef/chef/pull/11237) ([tas50](https://github.com/tas50)) <!-- 15.15.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cb492d7fa..8e994c45c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,12 +19,12 @@ GIT
PATH
remote: .
specs:
- chef (15.15.5)
+ chef (15.15.6)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.15.5)
- chef-utils (= 15.15.5)
+ chef-config (= 15.15.6)
+ chef-utils (= 15.15.6)
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
ed25519 (~> 1.2)
@@ -51,12 +51,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (>= 2.1.5, < 3.0)
- chef (15.15.5-universal-mingw32)
+ chef (15.15.6-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.15.5)
- chef-utils (= 15.15.5)
+ chef-config (= 15.15.6)
+ chef-utils (= 15.15.6)
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
ed25519 (~> 1.2)
@@ -99,15 +99,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.15.5)
- chef (= 15.15.5)
+ chef-bin (15.15.6)
+ chef (= 15.15.6)
PATH
remote: chef-config
specs:
- chef-config (15.15.5)
+ chef-config (15.15.6)
addressable
- chef-utils (= 15.15.5)
+ chef-utils (= 15.15.6)
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.5)
+ chef-utils (15.15.6)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 322e8edef5..d510df828f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.15.5 \ No newline at end of file
+15.15.6 \ 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 3f6ba4c522..88a4ee68b2 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.5".freeze
+ VERSION = "15.15.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index dbc6f48d38..3752110006 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.5".freeze
+ VERSION = "15.15.6".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 14bc72f47b..d204100177 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.5".freeze
+ VERSION = "15.15.6".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index b86057d823..7d0ac1e4b1 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.5")
+ VERSION = Chef::VersionString.new("15.15.6")
end
#