summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-10-09 17:50:05 +0000
committerChef Expeditor <expeditor@chef.io>2019-10-09 17:50:06 +0000
commit2ca37a3d5d84f2e373c393c254e39d58ec07f8f6 (patch)
treea9436182168a60565b6ae7cdfabd77c7deb6dfd1
parent97c8106e33aa1c0b590c8f960abf5a2975fe0112 (diff)
downloadchef-2ca37a3d5d84f2e373c393c254e39d58ec07f8f6.tar.gz
Bump version to 14.14.15 by Chef Expeditorv14.14.15
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-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, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 093e93ebd0..7154fae0d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 14.14.15 -->
+## [v14.14.15](https://github.com/chef/chef/tree/v14.14.15) (2019-10-09)
+
+#### Merged Pull Requests
+- Modify #8901 to not use arrays with mixlib-shellout [#8974](https://github.com/chef/chef/pull/8974) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.14.14 -->
+### Changes not yet released to stable
+
+#### Merged Pull Requests
+- Modify #8901 to not use arrays with mixlib-shellout [#8974](https://github.com/chef/chef/pull/8974) ([tas50](https://github.com/tas50)) <!-- 14.14.15 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fbbf0c4ca1..e724c3c6d3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.14)
+ chef (14.14.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.14)
+ chef-config (= 14.14.15)
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.14-universal-mingw32)
+ chef (14.14.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.14)
+ chef-config (= 14.14.15)
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.14)
+ chef-config (14.14.15)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index d0fee9158b..cd13918c61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.14 \ No newline at end of file
+14.14.15 \ 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 9fd6998852..dceb6d6729 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.14".freeze
+ VERSION = "14.14.15".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4f81cba9d3..651e15a586 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.14")
+ VERSION = Chef::VersionString.new("14.14.15")
end
#