summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2016-12-22 23:35:53 +0000
committerChef Versioner <chef-versioner@chef.io>2016-12-22 23:35:53 +0000
commit85c9830b3396451af209625ef2263013855ff776 (patch)
tree3126e9479c8b8e498b4cd0e3da89b0c019a0a7d0
parenta02b1156522ceb2a8b32cacb33ac5d9c02ccde25 (diff)
downloadchef-85c9830b3396451af209625ef2263013855ff776.tar.gz
Bump version of chef to 12.18.16 by Chef Versioner.v12.18.16
-rw-r--r--CHANGELOG.md5
-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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4fee656ee..682bf1caa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef).
-## [v12.18.15](https://github.com/chef/chef/tree/v12.18.15) (2016-12-22)
-[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.15)
+## [v12.18.16](https://github.com/chef/chef/tree/v12.18.16) (2016-12-22)
+[Full Changelog](https://github.com/chef/chef/compare/v12.17.44...v12.18.16)
**Implemented enhancements:**
@@ -15,6 +15,7 @@ This changelog reflects the current state of chef's master branch on github and
**Fixed bugs:**
+- Report a blank resource if sensitive is enabled [\#5668](https://github.com/chef/chef/pull/5668) ([afiune](https://github.com/afiune))
- Ensure node.docker? returns boolean [\#5645](https://github.com/chef/chef/pull/5645) ([andrewjamesbrown](https://github.com/andrewjamesbrown))
- Fix Data Collector organization parsing regex [\#5630](https://github.com/chef/chef/pull/5630) ([adamleff](https://github.com/adamleff))
- Core: Use object ID when detected unprocessed Resources [\#5604](https://github.com/chef/chef/pull/5604) ([adamleff](https://github.com/adamleff))
diff --git a/Gemfile.lock b/Gemfile.lock
index 7628c7f0ec..c73041f339 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -47,10 +47,10 @@ GIT
PATH
remote: .
specs:
- chef (12.18.15)
+ chef (12.18.16)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.15)
+ chef-config (= 12.18.16)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -76,10 +76,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.18.15-universal-mingw32)
+ chef (12.18.16-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.18.15)
+ chef-config (= 12.18.16)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -120,7 +120,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.18.15)
+ chef-config (12.18.16)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index d1a8f8d671..8f480a6256 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.18.15 \ No newline at end of file
+12.18.16 \ 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 f28957bde0..fe71279b3f 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 = "12.18.15"
+ VERSION = "12.18.16"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c9f0501781..3eb6410005 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "12.18.15"
+ VERSION = "12.18.16"
end
#