summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-23 17:45:38 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-23 17:45:38 +0000
commitc30f8d9892c6b834de3bb45b9e0bedf9182dc8e3 (patch)
tree936a3e41d68b1c9fcacb0e8ca69c563e4ac5a221
parenta62c378db72986a5894e240aab9359e9aefdc926 (diff)
downloadchef-c30f8d9892c6b834de3bb45b9e0bedf9182dc8e3.tar.gz
Bump version to 14.0.20 by Expeditorv14.0.20
-rw-r--r--CHANGELOG.md9
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fb765f11a..a0a0457294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.19 -->
-## [v14.0.19](https://github.com/chef/chef/tree/v14.0.19) (2018-01-23)
+<!-- latest_release 14.0.20 -->
+## [v14.0.20](https://github.com/chef/chef/tree/v14.0.20) (2018-01-23)
#### Merged Pull Requests
-- Bump to ruby 2.5.0 [#6770](https://github.com/chef/chef/pull/6770) ([thommay](https://github.com/thommay))
+- Fix the changelog for the 13.7 release [#6772](https://github.com/chef/chef/pull/6772) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Fix the changelog for the 13.7 release [#6772](https://github.com/chef/chef/pull/6772) ([tas50](https://github.com/tas50)) <!-- 14.0.20 -->
- Bump to ruby 2.5.0 [#6770](https://github.com/chef/chef/pull/6770) ([thommay](https://github.com/thommay)) <!-- 14.0.19 -->
- Fail on interval runs on windows [#6766](https://github.com/chef/chef/pull/6766) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.18 -->
- [MSYS-727] Added support for setting node policy name and group from knife [#6656](https://github.com/chef/chef/pull/6656) ([piyushawasthi](https://github.com/piyushawasthi)) <!-- 14.0.17 -->
@@ -1730,4 +1731,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 14341a0bf9..dcf8bd93c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.19)
+ chef (14.0.20)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.19)
+ chef-config (= 14.0.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.19-universal-mingw32)
+ chef (14.0.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.19)
+ chef-config (= 14.0.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.19)
+ chef-config (14.0.20)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 6b9febc861..4d9d189199 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.19 \ No newline at end of file
+14.0.20 \ 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 94ffe91f48..98cd0cf6b0 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.0.19"
+ VERSION = "14.0.20"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index cbf4ed6edc..71d71f7d39 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.0.19")
+ VERSION = Chef::VersionString.new("14.0.20")
end
#