summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-12 17:27:43 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-09-12 17:27:43 +0000
commit0f908bd71a724773f02a2c92ea6a1f0dcb1b4ca2 (patch)
tree0d286d84ea9dd40f3a200b7dc678e333aebc5663
parent4fce3bb1f3325729809a2e2c060bba2208c5dae8 (diff)
downloadchef-0f908bd71a724773f02a2c92ea6a1f0dcb1b4ca2.tar.gz
Bump version to 13.4.22 by Chef Expeditorv13.4.22
-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 4405ecf786..41c46b853e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,9 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.4.21 -->
-## [v13.4.21](https://github.com/chef/chef/tree/v13.4.21) (2017-09-12)
+<!-- latest_release 13.4.22 -->
+## [v13.4.22](https://github.com/chef/chef/tree/v13.4.22) (2017-09-12)
#### Merged Pull Requests
-- [MSYS-594] windows_task resource is not idempotent when specifying start_time and start_day [#6312](https://github.com/chef/chef/pull/6312) ([harikesh-kolekar](https://github.com/harikesh-kolekar))
+- MSYS-656 - fixed dsc_script for WMF5 [#6383](https://github.com/chef/chef/pull/6383) ([piyushawasthi](https://github.com/piyushawasthi))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -17,6 +17,7 @@
- Ignore validation errors in Resource#to_text [#6331](https://github.com/chef/chef/pull/6331) ([coderanger](https://github.com/coderanger)) <!-- 13.3.46 -->
#### Merged Pull Requests
+- MSYS-656 - fixed dsc_script for WMF5 [#6383](https://github.com/chef/chef/pull/6383) ([piyushawasthi](https://github.com/piyushawasthi)) <!-- 13.4.22 -->
- [MSYS-594] windows_task resource is not idempotent when specifying start_time and start_day [#6312](https://github.com/chef/chef/pull/6312) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) <!-- 13.4.21 -->
- Allow specifying default gateway on RHEL/Centos [#6386](https://github.com/chef/chef/pull/6386) ([tomdoherty](https://github.com/tomdoherty)) <!-- 13.4.20 -->
- Cleanup the current changelog [#6387](https://github.com/chef/chef/pull/6387) ([tas50](https://github.com/tas50)) <!-- 13.4.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d44ea8dd2a..e368a8eef1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.4.21)
+ chef (13.4.22)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.21)
+ chef-config (= 13.4.22)
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.4.21-universal-mingw32)
+ chef (13.4.22-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.4.21)
+ chef-config (= 13.4.22)
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.4.21)
+ chef-config (13.4.22)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index cd7bb1a3db..2fddbbe067 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.4.21 \ No newline at end of file
+13.4.22 \ 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 4a7ce31b3c..7ad2b71f1e 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.4.21"
+ VERSION = "13.4.22"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e6e825e877..e2ea126b45 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.4.21")
+ VERSION = Chef::VersionString.new("13.4.22")
end
#