summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-18 04:12:42 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-18 04:12:42 +0000
commite8acbca986f8e2df378442a1dad45a97fd6302ed (patch)
treebad3b799644d8a952a13580962b9593a5c27eca5
parent2680eb11481aa71a58cf20367692707966cbd80c (diff)
downloadchef-e8acbca986f8e2df378442a1dad45a97fd6302ed.tar.gz
Bump version to 15.0.222 by Chef Expeditorv15.0.222
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 e674852f1c..c8b68274ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.221 -->
-## [v15.0.221](https://github.com/chef/chef/tree/v15.0.221) (2019-04-18)
+<!-- latest_release 15.0.222 -->
+## [v15.0.222](https://github.com/chef/chef/tree/v15.0.222) (2019-04-18)
#### Merged Pull Requests
-- Use color in chef-solo by default on Windows [#8390](https://github.com/chef/chef/pull/8390) ([tas50](https://github.com/tas50))
+- Sync the CLI option descriptions between chef-client and chef-solo [#8391](https://github.com/chef/chef/pull/8391) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Sync the CLI option descriptions between chef-client and chef-solo [#8391](https://github.com/chef/chef/pull/8391) ([tas50](https://github.com/tas50)) <!-- 15.0.222 -->
- Use color in chef-solo by default on Windows [#8390](https://github.com/chef/chef/pull/8390) ([tas50](https://github.com/tas50)) <!-- 15.0.221 -->
- Improve the error message when no config can be loaded [#8389](https://github.com/chef/chef/pull/8389) ([tas50](https://github.com/tas50)) <!-- 15.0.220 -->
- Remove a functional test for the reboot_pending DSL [#8383](https://github.com/chef/chef/pull/8383) ([btm](https://github.com/btm)) <!-- 15.0.219 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index edff0cde2b..232982acb5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.221)
+ chef (15.0.222)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.221)
+ chef-config (= 15.0.222)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -52,10 +52,10 @@ PATH
proxifier (~> 1.0)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.221-universal-mingw32)
+ chef (15.0.222-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.221)
+ chef-config (= 15.0.222)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -93,7 +93,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.221)
+ chef-config (15.0.222)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index b823ec643e..b2f1ab9a38 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.221 \ No newline at end of file
+15.0.222 \ 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 1e0658f9b2..e538980f12 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 = "15.0.221".freeze
+ VERSION = "15.0.222".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0c9bdf03b9..c3ab36662e 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("15.0.221")
+ VERSION = Chef::VersionString.new("15.0.222")
end
#