summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-17 21:01:14 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-17 21:01:14 +0000
commitbea342daed755aff8b31d7cc3a6f3ad9e438ec92 (patch)
tree030b019fa0a9d1e12adf371b35b5649d3a68da7c
parent48b3702ed15148aac96ca25af9f81f96a26d2531 (diff)
downloadchef-bea342daed755aff8b31d7cc3a6f3ad9e438ec92.tar.gz
Bump version to 15.0.220 by Chef Expeditorv15.0.220
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 c07ce73b5f..54e35796e6 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.219 -->
-## [v15.0.219](https://github.com/chef/chef/tree/v15.0.219) (2019-04-17)
+<!-- latest_release 15.0.220 -->
+## [v15.0.220](https://github.com/chef/chef/tree/v15.0.220) (2019-04-17)
#### Merged Pull Requests
-- Remove a functional test for the reboot_pending DSL [#8383](https://github.com/chef/chef/pull/8383) ([btm](https://github.com/btm))
+- Improve the error message when no config can be loaded [#8389](https://github.com/chef/chef/pull/8389) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- 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 -->
- Allow encrypting a previously unencrypted data bag [#8077](https://github.com/chef/chef/pull/8077) ([vijaymmali1990](https://github.com/vijaymmali1990)) <!-- 15.0.218 -->
- Prevent accidentally configuring windows_service properties [#8351](https://github.com/chef/chef/pull/8351) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 15.0.217 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f67f5bead3..bf2f44f540 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.219)
+ chef (15.0.220)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.219)
+ chef-config (= 15.0.220)
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.219-universal-mingw32)
+ chef (15.0.220-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.219)
+ chef-config (= 15.0.220)
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.219)
+ chef-config (15.0.220)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
@@ -337,7 +337,7 @@ GEM
win32-ipc (>= 0.6.0)
win32-process (0.8.3)
ffi (>= 1.0.0)
- win32-service (2.1.2)
+ win32-service (2.1.4)
ffi
ffi-win32-extensions
win32-taskscheduler (2.0.4)
diff --git a/VERSION b/VERSION
index 0b68b966eb..027e2ba1ab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.219 \ No newline at end of file
+15.0.220 \ 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 5b63dc4a98..6c157403a4 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.219".freeze
+ VERSION = "15.0.220".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 13b43f9ddb..d7d80e8978 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.219")
+ VERSION = Chef::VersionString.new("15.0.220")
end
#