summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-01 16:19:21 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-01 16:19:21 +0000
commit7aa09027b604a5230cf28f059638782523d198ef (patch)
treee3f259abcf9b1ddc7981d07504fd93e1af2d2041
parent5711471652921b48647f5d6eab9d073d859ba36a (diff)
downloadchef-7aa09027b604a5230cf28f059638782523d198ef.tar.gz
Bump version to 14.14.6 by Chef Expeditorv14.14.6
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 492f9003d0..2c14d648e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.14.5 -->
-## [v14.14.5](https://github.com/chef/chef/tree/v14.14.5) (2019-09-18)
+<!-- latest_release 14.14.6 -->
+## [v14.14.6](https://github.com/chef/chef/tree/v14.14.6) (2019-10-01)
#### Merged Pull Requests
-- dnf_package fixes for RHEL8 backport to chef-14 [#8894](https://github.com/chef/chef/pull/8894) ([atward](https://github.com/atward))
+- Fix Windows Integration and Functional tests for BK [#8940](https://github.com/chef/chef/pull/8940) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
<!-- release_rollup since=14.13.11 -->
### Changes since 14.13.11 release
#### Merged Pull Requests
+- Fix Windows Integration and Functional tests for BK [#8940](https://github.com/chef/chef/pull/8940) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 14.14.6 -->
- dnf_package fixes for RHEL8 backport to chef-14 [#8894](https://github.com/chef/chef/pull/8894) ([atward](https://github.com/atward)) <!-- 14.14.5 -->
- Backport #8847 into Chef 14: Added support to provide additional options to bundle install [#8901](https://github.com/chef/chef/pull/8901) ([jjustice6](https://github.com/jjustice6)) <!-- 14.14.4 -->
- Revert &quot;Drop privileges before creating files in solo mode&quot; [#8881](https://github.com/chef/chef/pull/8881) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.14.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ec0e655409..b7960b35f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.5)
+ chef (14.14.6)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.5)
+ chef-config (= 14.14.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.14.5-universal-mingw32)
+ chef (14.14.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.5)
+ chef-config (= 14.14.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.14.5)
+ chef-config (14.14.6)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 4eb238f66c..614995ba69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.5 \ No newline at end of file
+14.14.6 \ 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 750c43fef5..b9811bb5fa 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.14.5".freeze
+ VERSION = "14.14.6".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9f90ce3466..f5e8d9ae82 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.14.5")
+ VERSION = Chef::VersionString.new("14.14.6")
end
#