summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-06 19:13:45 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-06 19:13:45 +0000
commit52d2639707944dff045882b388a1a4179cb30d2a (patch)
tree3e8e6608a9dc0f8e2568dfb1f9a1df8d39a10ab8
parent78b8b769d615b8c431b778e90c7dbfa50ae3a13d (diff)
downloadchef-52d2639707944dff045882b388a1a4179cb30d2a.tar.gz
Bump version to 14.14.34 by Chef Expeditorv14.14.34
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 7183c98507..5cfa1ead6d 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.33 -->
-## [v14.14.33](https://github.com/chef/chef/tree/v14.14.33) (2019-12-03)
+<!-- latest_release 14.14.34 -->
+## [v14.14.34](https://github.com/chef/chef/tree/v14.14.34) (2019-12-06)
#### Merged Pull Requests
-- kernel_module: Add new options property (backport from chef-15 to chef-14) [#9120](https://github.com/chef/chef/pull/9120) ([ramereth](https://github.com/ramereth))
+- Fix Chef-14 Test Failures [#9142](https://github.com/chef/chef/pull/9142) ([christopher-snapp](https://github.com/christopher-snapp))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix Chef-14 Test Failures [#9142](https://github.com/chef/chef/pull/9142) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 14.14.34 -->
- kernel_module: Add new options property (backport from chef-15 to chef-14) [#9120](https://github.com/chef/chef/pull/9120) ([ramereth](https://github.com/ramereth)) <!-- 14.14.33 -->
- Boilerplate and testing backports from master [#9128](https://github.com/chef/chef/pull/9128) ([tas50](https://github.com/tas50)) <!-- 14.14.32 -->
- Pull in testing updates from master branch [#9127](https://github.com/chef/chef/pull/9127) ([tas50](https://github.com/tas50)) <!-- 14.14.31 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a290dbef44..d8a8ce9f73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.33)
+ chef (14.14.34)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.33)
+ chef-config (= 14.14.34)
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.33-universal-mingw32)
+ chef (14.14.34-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.33)
+ chef-config (= 14.14.34)
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.33)
+ chef-config (14.14.34)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index dd8a4053dc..0284de34db 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.33 \ No newline at end of file
+14.14.34 \ 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 a374da0cf4..e12e299ee1 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.33".freeze
+ VERSION = "14.14.34".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 5d8aacfe95..90db83981f 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.33")
+ VERSION = Chef::VersionString.new("14.14.34")
end
#