summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-11-05 21:46:29 +0000
committerChef Expeditor <expeditor@chef.io>2019-11-05 21:46:29 +0000
commitd770314137774ed9d3bcfb2eea6436eff8769292 (patch)
tree871418bcbd6a79336627bf8ebc46138aa042ca58
parentf06410f8d913c340af93a59de25bb818a38bee31 (diff)
downloadchef-d770314137774ed9d3bcfb2eea6436eff8769292.tar.gz
Bump version to 14.14.29 by Chef Expeditorv14.14.29
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 96404c4976..b9343b1a37 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.28 -->
-## [v14.14.28](https://github.com/chef/chef/tree/v14.14.28) (2019-11-05)
+<!-- latest_release 14.14.29 -->
+## [v14.14.29](https://github.com/chef/chef/tree/v14.14.29) (2019-11-05)
#### Merged Pull Requests
-- service/systemd_unit: Don&#39;t try to reenable services in an indirect status [#9063](https://github.com/chef/chef/pull/9063) ([jaymzh](https://github.com/jaymzh))
+- Update nokogiri, libxml2, and libxslt to latest [#9062](https://github.com/chef/chef/pull/9062) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.14.25 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update nokogiri, libxml2, and libxslt to latest [#9062](https://github.com/chef/chef/pull/9062) ([tas50](https://github.com/tas50)) <!-- 14.14.29 -->
- service/systemd_unit: Don&#39;t try to reenable services in an indirect status [#9063](https://github.com/chef/chef/pull/9063) ([jaymzh](https://github.com/jaymzh)) <!-- 14.14.28 -->
- [chef-14] backport #9049 [#9051](https://github.com/chef/chef/pull/9051) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 14.14.27 -->
- systemd_unit needs to log (chef 14 backport) [#9057](https://github.com/chef/chef/pull/9057) ([jaymzh](https://github.com/jaymzh)) <!-- 14.14.26 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d2f7867ec1..269646b81c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.28)
+ chef (14.14.29)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.28)
+ chef-config (= 14.14.29)
chef-zero (>= 13.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.28-universal-mingw32)
+ chef (14.14.29-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.28)
+ chef-config (= 14.14.29)
chef-zero (>= 13.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.28)
+ chef-config (14.14.29)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 16f5390b82..61dc710a1a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.28 \ No newline at end of file
+14.14.29 \ 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 574d9ff49f..fd324b3b76 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.28".freeze
+ VERSION = "14.14.29".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f13b618bd2..52e837aa90 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.28")
+ VERSION = Chef::VersionString.new("14.14.29")
end
#