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 f3a6e186a9..539fddd96d 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.223 -->
-## [v15.0.223](https://github.com/chef/chef/tree/v15.0.223) (2019-04-18)
+<!-- latest_release 15.0.224 -->
+## [v15.0.224](https://github.com/chef/chef/tree/v15.0.224) (2019-04-19)
#### Merged Pull Requests
-- Replace highline with tty-screen in knife list [#8381](https://github.com/chef/chef/pull/8381) ([tas50](https://github.com/tas50))
+- fix default/override attribute blacklists and whitelists [#8396](https://github.com/chef/chef/pull/8396) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- fix default/override attribute blacklists and whitelists [#8396](https://github.com/chef/chef/pull/8396) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.224 -->
- Replace highline with tty-screen in knife list [#8381](https://github.com/chef/chef/pull/8381) ([tas50](https://github.com/tas50)) <!-- 15.0.223 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0b5efcf1e0..e533f66366 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.223)
+ chef (15.0.224)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.223)
+ chef-config (= 15.0.224)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -53,10 +53,10 @@ PATH
syslog-logger (~> 1.6)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.0.223-universal-mingw32)
+ chef (15.0.224-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.223)
+ chef-config (= 15.0.224)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -95,7 +95,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.223)
+ chef-config (15.0.224)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 29ad789bfc..2ab97c0d4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.223 \ No newline at end of file
+15.0.224 \ 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 e21cb520a0..99f9547ce5 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.223".freeze
+ VERSION = "15.0.224".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d141938fd5..c4b11d03aa 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.223")
+ VERSION = Chef::VersionString.new("15.0.224")
end
#