summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-30 17:17:17 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-04-30 17:17:17 +0000
commit6d6d3ef02e447bed5a2938dfb2aa261d07d68d60 (patch)
tree615490b4b3cfb5ebb60c999215ff9ddd258a2cc3
parentcbe083de65e1cd7b1909266837cb662dcadbf1f5 (diff)
downloadchef-6d6d3ef02e447bed5a2938dfb2aa261d07d68d60.tar.gz
Bump version to 14.0.214 by Chef Expeditorv14.0.214
-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 6fa87e09bc..87134dfbcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.213 -->
-## [v14.0.213](https://github.com/chef/chef/tree/v14.0.213) (2018-04-26)
+<!-- latest_release 14.0.214 -->
+## [v14.0.214](https://github.com/chef/chef/tree/v14.0.214) (2018-04-30)
#### Merged Pull Requests
-- Fix NoMethodError when (un)locking single packages in apt and zypper [#7138](https://github.com/chef/chef/pull/7138) ([RoboticCheese](https://github.com/RoboticCheese))
+- Whitelist some additional Hash/Array methods [#7198](https://github.com/chef/chef/pull/7198) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=14.0.202 -->
### Changes since 14.0.202 release
#### Merged Pull Requests
+- Whitelist some additional Hash/Array methods [#7198](https://github.com/chef/chef/pull/7198) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.214 -->
- Fix NoMethodError when (un)locking single packages in apt and zypper [#7138](https://github.com/chef/chef/pull/7138) ([RoboticCheese](https://github.com/RoboticCheese)) <!-- 14.0.213 -->
- CLI help text now includes :trace log level [#7186](https://github.com/chef/chef/pull/7186) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.212 -->
- Run all tests in CI [#7183](https://github.com/chef/chef/pull/7183) ([thommay](https://github.com/thommay)) <!-- 14.0.211 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 40bda6152f..4c61bbd55c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.213)
+ chef (14.0.214)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.213)
+ chef-config (= 14.0.214)
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.0.213-universal-mingw32)
+ chef (14.0.214-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.213)
+ chef-config (= 14.0.214)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -91,7 +91,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.213)
+ chef-config (14.0.214)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 0fc943dbf3..0b8f404878 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.213 \ No newline at end of file
+14.0.214 \ 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 95db9ac91f..e901f4d835 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.0.213"
+ VERSION = "14.0.214"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 459ef50730..0fc32135a8 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.0.213")
+ VERSION = Chef::VersionString.new("14.0.214")
end
#