summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-21 08:14:41 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-21 08:14:41 +0000
commitd2cd93486f8183a96d83024d8c2e9d8b0b5088b6 (patch)
treef12dbdf58fe22e7f3cb2e1aabbd88d0943b77b7b
parent9877e3a4ee7e7a0b267d932ab08a8773e2b8329f (diff)
downloadchef-d2cd93486f8183a96d83024d8c2e9d8b0b5088b6.tar.gz
Bump version to 14.1.20 by Chef Expeditorv14.1.20
-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 e7a6771bd3..1a47d5b0d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.1.19 -->
-## [v14.1.19](https://github.com/chef/chef/tree/v14.1.19) (2018-05-18)
+<!-- latest_release 14.1.20 -->
+## [v14.1.20](https://github.com/chef/chef/tree/v14.1.20) (2018-05-21)
#### Merged Pull Requests
-- Fix manifest entries for root files [#7270](https://github.com/chef/chef/pull/7270) ([thommay](https://github.com/thommay))
+- Fix systemd_unit user context [#7274](https://github.com/chef/chef/pull/7274) ([mal](https://github.com/mal))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- Fix systemd_unit user context [#7274](https://github.com/chef/chef/pull/7274) ([mal](https://github.com/mal)) <!-- 14.1.20 -->
- Fix manifest entries for root files [#7270](https://github.com/chef/chef/pull/7270) ([thommay](https://github.com/thommay)) <!-- 14.1.19 -->
- object validation for DataHandlerBase#normalize_hash [#7264](https://github.com/chef/chef/pull/7264) ([jeremymv2](https://github.com/jeremymv2)) <!-- 14.1.18 -->
- [MSYS-817] fix for windows_task does not parse backslashes in the commad property [#7281](https://github.com/chef/chef/pull/7281) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.1.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d3f8861c1b..de27e0b0d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.19)
+ chef (14.1.20)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.19)
+ chef-config (= 14.1.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -46,10 +46,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.1.19-universal-mingw32)
+ chef (14.1.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.19)
+ chef-config (= 14.1.20)
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 (14.1.19)
+ chef-config (14.1.20)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index e07484cf5b..5070ace326 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.19 \ No newline at end of file
+14.1.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 76ab22df66..51f853e5e4 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.1.19"
+ VERSION = "14.1.20"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ce77ccee1d..fc1c98ab40 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.1.19")
+ VERSION = Chef::VersionString.new("14.1.20")
end
#