summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-03 00:29:07 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-03 00:29:07 +0000
commitd2bb31fa2308b16a21c070e88438261c4becc2bd (patch)
tree9ffe797e18698b68cde7b5bc4e228f95af4ccc5d
parent2e9471af956ef8a6de6ec5d41dc448b0f970df20 (diff)
downloadchef-d2bb31fa2308b16a21c070e88438261c4becc2bd.tar.gz
Bump version to 14.14.33 by Chef Expeditorv14.14.33
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 66189de445..7183c98507 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.32 -->
-## [v14.14.32](https://github.com/chef/chef/tree/v14.14.32) (2019-12-02)
+<!-- latest_release 14.14.33 -->
+## [v14.14.33](https://github.com/chef/chef/tree/v14.14.33) (2019-12-03)
#### Merged Pull Requests
-- Boilerplate and testing backports from master [#9128](https://github.com/chef/chef/pull/9128) ([tas50](https://github.com/tas50))
+- 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))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### 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)) <!-- 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 -->
- [chef-14] backport#9028 Fix Exception: NoMethodError: undefined… [#9072](https://github.com/chef/chef/pull/9072) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 14.14.30 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f0472069d4..a290dbef44 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.32)
+ chef (14.14.33)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.32)
+ chef-config (= 14.14.33)
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.32-universal-mingw32)
+ chef (14.14.33-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.32)
+ chef-config (= 14.14.33)
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.32)
+ chef-config (14.14.33)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 9713f2bc78..dd8a4053dc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.32 \ No newline at end of file
+14.14.33 \ 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 5e8406909a..a374da0cf4 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.32".freeze
+ VERSION = "14.14.33".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c6cb01d307..5d8aacfe95 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.32")
+ VERSION = Chef::VersionString.new("14.14.33")
end
#