summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 5da3af912b..f4b3446385 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.11.5 -->
-## [v15.11.5](https://github.com/chef/chef/tree/v15.11.5) (2020-05-28)
+<!-- latest_release 15.11.6 -->
+## [v15.11.6](https://github.com/chef/chef/tree/v15.11.6) (2020-05-29)
#### Merged Pull Requests
-- Additional Chef-16 knife config API compatibility [#9924](https://github.com/chef/chef/pull/9924) ([lamont-granquist](https://github.com/lamont-granquist))
+- Avoid some constant warnings in specs [#9935](https://github.com/chef/chef/pull/9935) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.3 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Avoid some constant warnings in specs [#9935](https://github.com/chef/chef/pull/9935) ([tas50](https://github.com/tas50)) <!-- 15.11.6 -->
- Additional Chef-16 knife config API compatibility [#9924](https://github.com/chef/chef/pull/9924) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.11.5 -->
- Pin habitat bundler to 1.17.3 [#9915](https://github.com/chef/chef/pull/9915) ([tas50](https://github.com/tas50)) <!-- 15.11.4 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bf9852a4c1..6b84d32ade 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.11.5)
+ chef (15.11.6)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.5)
- chef-utils (= 15.11.5)
+ chef-config (= 15.11.6)
+ chef-utils (= 15.11.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.11.5-universal-mingw32)
+ chef (15.11.6-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.11.5)
- chef-utils (= 15.11.5)
+ chef-config (= 15.11.6)
+ chef-utils (= 15.11.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.11.5)
- chef (= 15.11.5)
+ chef-bin (15.11.6)
+ chef (= 15.11.6)
PATH
remote: chef-config
specs:
- chef-config (15.11.5)
+ chef-config (15.11.6)
addressable
- chef-utils (= 15.11.5)
+ chef-utils (= 15.11.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.11.5)
+ chef-utils (15.11.6)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 205ecb92e2..7b10f109c5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.11.5 \ No newline at end of file
+15.11.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 6c94d08fb9..f157e0a8cf 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.11.5".freeze
+ VERSION = "15.11.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 4ae713c8a5..f84710d6c9 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.11.5".freeze
+ VERSION = "15.11.6".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index c812a11a93..2f12c1f205 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.11.5".freeze
+ VERSION = "15.11.6".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 04ba188aab..a2767267e9 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.11.5")
+ VERSION = Chef::VersionString.new("15.11.6")
end
#