summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-24 16:56:45 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-24 16:56:45 +0000
commit15f41cc22e6d911fb4ae2e6e696b5e6d412b649c (patch)
tree12d2ccd1df6794c2e7541ae6107a242d3345402c
parent8995c6b93ff39661278c6c5e3b689bbaed94ede2 (diff)
downloadchef-15f41cc22e6d911fb4ae2e6e696b5e6d412b649c.tar.gz
Bump version to 14.6.39 by Chef Expeditorv14.6.39
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2a43e4e1d..4a7cd0f85f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.6.38 -->
-## [v14.6.38](https://github.com/chef/chef/tree/v14.6.38) (2018-10-24)
+<!-- latest_release 14.6.39 -->
+## [v14.6.39](https://github.com/chef/chef/tree/v14.6.39) (2018-10-24)
#### Merged Pull Requests
-- Don&#39;t ship contributing.md and VERSION file in the gem [#7769](https://github.com/chef/chef/pull/7769) ([tas50](https://github.com/tas50))
+- Fix registry key bug when sensitive is true [#7767](https://github.com/chef/chef/pull/7767) ([josh-barker](https://github.com/josh-barker))
<!-- latest_release -->
<!-- release_rollup since=14.5.33 -->
### Changes since 14.5.33 release
#### Merged Pull Requests
+- Fix registry key bug when sensitive is true [#7767](https://github.com/chef/chef/pull/7767) ([josh-barker](https://github.com/josh-barker)) <!-- 14.6.39 -->
- Don&#39;t ship contributing.md and VERSION file in the gem [#7769](https://github.com/chef/chef/pull/7769) ([tas50](https://github.com/tas50)) <!-- 14.6.38 -->
- Throw better error on invalid resources actions [#7729](https://github.com/chef/chef/pull/7729) ([tas50](https://github.com/tas50)) <!-- 14.6.37 -->
- [chef/chef]Fix duplicate logs [#7698](https://github.com/chef/chef/pull/7698) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.6.36 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 598239b84a..6b37613b81 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.6.38)
+ chef (14.6.39)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.38)
+ chef-config (= 14.6.39)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.6.38-universal-mingw32)
+ chef (14.6.39-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.6.38)
+ chef-config (= 14.6.39)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.6.38)
+ chef-config (14.6.39)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 1e910f0ec5..cc9847abfc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.38 \ No newline at end of file
+14.6.39 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6cce64ed2b..7365250cde 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.6.38".freeze
+ VERSION = "14.6.39".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 938356e09e..8e71cf4d16 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.6.38")
+ VERSION = Chef::VersionString.new("14.6.39")
end
#