summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2019-12-27 15:59:33 +0000
committerChef Expeditor <expeditor@chef.io>2019-12-27 15:59:33 +0000
commit44ab48437090a900382bbbaf79e6024bf357b742 (patch)
tree91a9fa6e7e70b73804ee182ff7fe8169ce06ee82
parent221b3fd33bbd5166c03e6203f7a3b5c3de5aa48b (diff)
downloadchef-44ab48437090a900382bbbaf79e6024bf357b742.tar.gz
Bump version to 14.14.36 by Chef Expeditorv14.14.36
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d28b35f220..e8506fc197 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.35 -->
-## [v14.14.35](https://github.com/chef/chef/tree/v14.14.35) (2019-12-06)
+<!-- latest_release 14.14.36 -->
+## [v14.14.36](https://github.com/chef/chef/tree/v14.14.36) (2019-12-27)
#### Merged Pull Requests
-- Update Chef 14 deps to the latest + trim the install size [#9143](https://github.com/chef/chef/pull/9143) ([tas50](https://github.com/tas50))
+- Update all deps to the latest [#9193](https://github.com/chef/chef/pull/9193) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update all deps to the latest [#9193](https://github.com/chef/chef/pull/9193) ([tas50](https://github.com/tas50)) <!-- 14.14.36 -->
- Update Chef 14 deps to the latest + trim the install size [#9143](https://github.com/chef/chef/pull/9143) ([tas50](https://github.com/tas50)) <!-- 14.14.35 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c689706e4..4603d9ec74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.14.35)
+ chef (14.14.36)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.35)
+ chef-config (= 14.14.36)
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.35-universal-mingw32)
+ chef (14.14.36-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.14.35)
+ chef-config (= 14.14.36)
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.35)
+ chef-config (14.14.36)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -373,4 +373,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.17.2
+ 1.17.3
diff --git a/VERSION b/VERSION
index b9e078d03d..0bcbf99ced 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.14.35 \ No newline at end of file
+14.14.36 \ 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 e1b1397caf..0b7c2eb6ad 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.35".freeze
+ VERSION = "14.14.36".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 350aa41109..1644c5aca1 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.35")
+ VERSION = Chef::VersionString.new("14.14.36")
end
#