summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-05 18:18:29 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-05 18:18:29 +0000
commit81b86b397ac3b0ab6c7096cc0812af755055f596 (patch)
treec25d8e7e57c127f495b74dacde5fcd5057d6b03e
parent0eb95716799d99aba03e359cbc59c6c908f1334b (diff)
downloadchef-81b86b397ac3b0ab6c7096cc0812af755055f596.tar.gz
Bump version to 14.15.0 by Chef Expeditorv14.15.0
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 503be2cc79..167cd22f9c 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.49 -->
-## [v14.14.49](https://github.com/chef/chef/tree/v14.14.49) (2020-04-04)
+<!-- latest_release 14.15.0 -->
+## [v14.15.0](https://github.com/chef/chef/tree/v14.15.0) (2020-04-05)
#### Merged Pull Requests
-- debian 10 ifconfig fix [#9599](https://github.com/chef/chef/pull/9599) ([btm](https://github.com/btm))
+- Backport windows_task PR #8420 and #9223 [#9601](https://github.com/chef/chef/pull/9601) ([Vasu1105](https://github.com/Vasu1105))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Backport windows_task PR #8420 and #9223 [#9601](https://github.com/chef/chef/pull/9601) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.15.0 -->
- debian 10 ifconfig fix [#9599](https://github.com/chef/chef/pull/9599) ([btm](https://github.com/btm)) <!-- 14.14.49 -->
- Match platforms to chef-15 [#9598](https://github.com/chef/chef/pull/9598) ([btm](https://github.com/btm)) <!-- 14.14.48 -->
- Skip the ifconfig functional tests if we don&#39;t have ifconfig [#9597](https://github.com/chef/chef/pull/9597) ([btm](https://github.com/btm)) <!-- 14.14.47 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8169c85699..9842000d96 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.49)
+ chef (14.15.0)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.49)
+ chef-config (= 14.15.0)
chef-zero (>= 13.0, < 15.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.49-universal-mingw32)
+ chef (14.15.0-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.49)
+ chef-config (= 14.15.0)
chef-zero (>= 13.0, < 15.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.49)
+ chef-config (14.15.0)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 3e7d39631b..d430b8ac29 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.49 \ No newline at end of file
+14.15.0 \ 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 e134377455..367e684600 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.49".freeze
+ VERSION = "14.15.0".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 48f18ad03a..083a7cd91a 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.49")
+ VERSION = Chef::VersionString.new("14.15.0")
end
#