summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-09 18:18:15 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-09 18:18:15 +0000
commite598e507599e6217b815a3082ca8a704681295cb (patch)
treee72707f6a5e4adfc75422ca5d67fb97bd4db5841
parent29783478a5320df03fa4bf1a1b64319c0e7bb264 (diff)
downloadchef-e598e507599e6217b815a3082ca8a704681295cb.tar.gz
Bump version to 15.6.5 by Chef Expeditorv15.6.5
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 0b3758363c..7d12fd6331 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.6.4 -->
-## [v15.6.4](https://github.com/chef/chef/tree/v15.6.4) (2019-12-09)
+<!-- latest_release 15.6.5 -->
+## [v15.6.5](https://github.com/chef/chef/tree/v15.6.5) (2019-12-09)
#### Merged Pull Requests
-- Replace hardcoded /etc/chef with Chef::Dist::CONF_DIR [#9060](https://github.com/chef/chef/pull/9060) ([bobchaos](https://github.com/bobchaos))
+- Fix for ChefConfig should expand relative paths [#9042](https://github.com/chef/chef/pull/9042) ([kapilchouhan99](https://github.com/kapilchouhan99))
<!-- latest_release -->
<!-- release_rollup since=15.5.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix for ChefConfig should expand relative paths [#9042](https://github.com/chef/chef/pull/9042) ([kapilchouhan99](https://github.com/kapilchouhan99)) <!-- 15.6.5 -->
- Replace hardcoded /etc/chef with Chef::Dist::CONF_DIR [#9060](https://github.com/chef/chef/pull/9060) ([bobchaos](https://github.com/bobchaos)) <!-- 15.6.4 -->
- Symbolize config for ssl_verify_mode in credentials [#9064](https://github.com/chef/chef/pull/9064) ([teknofire](https://github.com/teknofire)) <!-- 15.6.3 -->
- Specify item path in Node.read! error message [#9147](https://github.com/chef/chef/pull/9147) ([zeusttu](https://github.com/zeusttu)) <!-- 15.6.2 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 028d0acf30..d95af42808 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.6.4)
+ chef (15.6.5)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.6.4)
- chef-utils (= 15.6.4)
+ chef-config (= 15.6.5)
+ chef-utils (= 15.6.5)
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.6.4-universal-mingw32)
+ chef (15.6.5-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.6.4)
- chef-utils (= 15.6.4)
+ chef-config (= 15.6.5)
+ chef-utils (= 15.6.5)
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.6.4)
- chef (= 15.6.4)
+ chef-bin (15.6.5)
+ chef (= 15.6.5)
PATH
remote: chef-config
specs:
- chef-config (15.6.4)
+ chef-config (15.6.5)
addressable
- chef-utils (= 15.6.4)
+ chef-utils (= 15.6.5)
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.6.4)
+ chef-utils (15.6.5)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 5d62dc8319..adf77929fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.6.4 \ No newline at end of file
+15.6.5 \ 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 431e8c4552..a68721e55d 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.6.4".freeze
+ VERSION = "15.6.5".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 50b1b6de77..cdb362672a 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.6.4".freeze
+ VERSION = "15.6.5".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index d73ff17d05..0aebccf34c 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.6.4".freeze
+ VERSION = "15.6.5".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 99e8152681..afcd79828d 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.6.4")
+ VERSION = Chef::VersionString.new("15.6.5")
end
#