summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-07-29 00:40:05 +0000
committerChef Expeditor <chef-ci@chef.io>2020-07-29 00:40:05 +0000
commit91985234d15894b6f1f7546cf65f9e84849cbec0 (patch)
tree484faf90b0cf614a716bb29b02a2a42a524a5145
parent5a6101f9d86a0d0066d30e327fa96cd89b35fa1c (diff)
downloadchef-91985234d15894b6f1f7546cf65f9e84849cbec0.tar.gz
Bump version to 15.13.6 by Chef Expeditorv15.13.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 a04efc6521..2fd578515e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.13.5 -->
-## [v15.13.5](https://github.com/chef/chef/tree/v15.13.5) (2020-07-23)
+<!-- latest_release 15.13.6 -->
+## [v15.13.6](https://github.com/chef/chef/tree/v15.13.6) (2020-07-29)
#### Merged Pull Requests
-- Bump mixlib-shellout to 3.1.1 and inspec to 4.22.1 [#10184](https://github.com/chef/chef/pull/10184) ([tas50](https://github.com/tas50))
+- Update mixlib-shellout to 3.1.2 [#10219](https://github.com/chef/chef/pull/10219) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.12.22 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update mixlib-shellout to 3.1.2 [#10219](https://github.com/chef/chef/pull/10219) ([tas50](https://github.com/tas50)) <!-- 15.13.6 -->
- Bump mixlib-shellout to 3.1.1 and inspec to 4.22.1 [#10184](https://github.com/chef/chef/pull/10184) ([tas50](https://github.com/tas50)) <!-- 15.13.5 -->
- Backport various testing fixes from Infra Client 16 [#10168](https://github.com/chef/chef/pull/10168) ([tas50](https://github.com/tas50)) <!-- 15.13.4 -->
- Apply chefstyle fixes from Infra Client 16 [#10167](https://github.com/chef/chef/pull/10167) ([tas50](https://github.com/tas50)) <!-- 15.13.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 98a2e02a8e..0edb6f4061 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.13.5)
+ chef (15.13.6)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.5)
- chef-utils (= 15.13.5)
+ chef-config (= 15.13.6)
+ chef-utils (= 15.13.6)
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.13.5-universal-mingw32)
+ chef (15.13.6-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.5)
- chef-utils (= 15.13.5)
+ chef-config (= 15.13.6)
+ chef-utils (= 15.13.6)
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.13.5)
- chef (= 15.13.5)
+ chef-bin (15.13.6)
+ chef (= 15.13.6)
PATH
remote: chef-config
specs:
- chef-config (15.13.5)
+ chef-config (15.13.6)
addressable
- chef-utils (= 15.13.5)
+ chef-utils (= 15.13.6)
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.13.5)
+ chef-utils (15.13.6)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index ec4e8d42fc..a5496b5ee2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.13.5 \ No newline at end of file
+15.13.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 8c5ed98e5f..0c64507fb0 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.13.5".freeze
+ VERSION = "15.13.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 8e7b081fc3..e5650beba3 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.13.5".freeze
+ VERSION = "15.13.6".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index e80e6dee1e..662b506d22 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.13.5".freeze
+ VERSION = "15.13.6".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d0569d29eb..7bda67ebc8 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.13.5")
+ VERSION = Chef::VersionString.new("15.13.6")
end
#