summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-04-19 22:20:25 +0000
committerChef Expeditor <chef-ci@chef.io>2019-04-19 22:20:25 +0000
commit6cdc8977fe699fa34b6542e852e60a60fa33b22a (patch)
treec465b912d3c2b3a89dbfb284c3bf1960462942b5
parent0fd0039a111ae800fb60fd79b9f0bd7c01e50161 (diff)
downloadchef-6cdc8977fe699fa34b6542e852e60a60fa33b22a.tar.gz
Bump version to 14.12.7 by Chef Expeditorv14.12.7
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 8e1333d844..d56f0864b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.12.6 -->
-## [v14.12.6](https://github.com/chef/chef/tree/v14.12.6) (2019-04-19)
+<!-- latest_release 14.12.7 -->
+## [v14.12.7](https://github.com/chef/chef/tree/v14.12.7) (2019-04-19)
#### Merged Pull Requests
-- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50))
+- Fix default/override attribute blacklists and whitelists [#8400](https://github.com/chef/chef/pull/8400) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.12.3 -->
### Changes since 14.12.3 release
#### Merged Pull Requests
+- Fix default/override attribute blacklists and whitelists [#8400](https://github.com/chef/chef/pull/8400) ([tas50](https://github.com/tas50)) <!-- 14.12.7 -->
- Add placeholder license acceptance flags [#8398](https://github.com/chef/chef/pull/8398) ([tas50](https://github.com/tas50)) <!-- 14.12.6 -->
- Update win32-service + bump inspec to 3.9.3 [#8387](https://github.com/chef/chef/pull/8387) ([tas50](https://github.com/tas50)) <!-- 14.12.5 -->
- Backport #8077 to Chef 14 [#8384](https://github.com/chef/chef/pull/8384) ([btm](https://github.com/btm)) <!-- 14.12.4 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index ac674ef364..7d909c0e43 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.12.6)
+ chef (14.12.7)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.6)
+ chef-config (= 14.12.7)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.12.6-universal-mingw32)
+ chef (14.12.7-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.12.6)
+ chef-config (= 14.12.7)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.12.6)
+ chef-config (14.12.7)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index f683b68c32..69942718bf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.12.6 \ No newline at end of file
+14.12.7 \ 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 4076ab99d2..ac548237ce 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.12.6".freeze
+ VERSION = "14.12.7".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 118ec50e7f..cb38cbb57f 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.12.6")
+ VERSION = Chef::VersionString.new("14.12.7")
end
#