summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 e9d7d2428d..12a652cb21 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.211 -->
-## [v14.0.211](https://github.com/chef/chef/tree/v14.0.211) (2018-04-26)
+<!-- latest_release 14.0.212 -->
+## [v14.0.212](https://github.com/chef/chef/tree/v14.0.212) (2018-04-26)
#### Merged Pull Requests
-- Run all tests in CI [#7183](https://github.com/chef/chef/pull/7183) ([thommay](https://github.com/thommay))
+- CLI help text now includes :trace log level [#7186](https://github.com/chef/chef/pull/7186) ([stuartpreston](https://github.com/stuartpreston))
<!-- latest_release -->
<!-- release_rollup since=14.0.202 -->
### Changes since 14.0.202 release
#### Merged Pull Requests
+- 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 -->
- whitespace fix to make expeditor run [#7179](https://github.com/chef/chef/pull/7179) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.210 -->
- Ubuntu 1804 - passing tests and fixed ifconfig provider [#7174](https://github.com/chef/chef/pull/7174) ([thommay](https://github.com/thommay)) <!-- 14.0.208 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f6c3cc539..dc9ef69da1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.211)
+ chef (14.0.212)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.211)
+ chef-config (= 14.0.212)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -45,10 +45,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.211-universal-mingw32)
+ chef (14.0.212-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.211)
+ chef-config (= 14.0.212)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -90,7 +90,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.211)
+ chef-config (14.0.212)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 8cb749cdd4..dfd5a78bc1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.211 \ No newline at end of file
+14.0.212 \ 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 68d81c0ed6..a96393a805 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.211"
+ VERSION = "14.0.212"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9eb678985f..dbcba26797 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.211")
+ VERSION = Chef::VersionString.new("14.0.212")
end
#