summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-29 19:23:09 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-11-29 19:23:09 +0000
commitb04c76614f9cd0c67d871ee260fcb680e99a2c89 (patch)
tree520eb2e63a3b4dd3e988d123a52bd1cfd100f99a
parent782f6c5ebc5fd4f9eda3e0e2aa537232de658320 (diff)
downloadchef-b04c76614f9cd0c67d871ee260fcb680e99a2c89.tar.gz
Bump version to 13.6.21 by Expeditorv13.6.21
-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 60a21df81f..71a54bf180 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.20 -->
-## [v13.6.20](https://github.com/chef/chef/tree/v13.6.20) (2017-11-29)
+<!-- latest_release 13.6.21 -->
+## [v13.6.21](https://github.com/chef/chef/tree/v13.6.21) (2017-11-29)
#### Merged Pull Requests
-- add unit_name name_property to systemd_unit (fixes #6542) [#6546](https://github.com/chef/chef/pull/6546) ([nathwill](https://github.com/nathwill))
+- Fix windows_path converging on every run [#6541](https://github.com/chef/chef/pull/6541) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Fix windows_path converging on every run [#6541](https://github.com/chef/chef/pull/6541) ([tas50](https://github.com/tas50)) <!-- 13.6.21 -->
- add unit_name name_property to systemd_unit (fixes #6542) [#6546](https://github.com/chef/chef/pull/6546) ([nathwill](https://github.com/nathwill)) <!-- 13.6.20 -->
- fix NodeMap to not throw exceptions on platform_versions [#6608](https://github.com/chef/chef/pull/6608) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.19 -->
- Enable Fedora integration testing in Travis [#6523](https://github.com/chef/chef/pull/6523) ([tas50](https://github.com/tas50)) <!-- 13.6.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9da758e6f0..067f6a2946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.20)
+ chef (13.6.21)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.20)
+ chef-config (= 13.6.21)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.20-universal-mingw32)
+ chef (13.6.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.20)
+ chef-config (= 13.6.21)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.20)
+ chef-config (13.6.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 17303bdd18..e7ab43d547 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.20 \ No newline at end of file
+13.6.21 \ 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 cfd5997db8..3d1133c7a2 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 = "13.6.20"
+ VERSION = "13.6.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 01f95d065c..0c1b10d8a2 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("13.6.20")
+ VERSION = Chef::VersionString.new("13.6.21")
end
#