summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-02-10 21:28:25 +0000
committerChef Versioner <chef-versioner@chef.io>2017-02-10 21:28:25 +0000
commitc32cb1c97adfb73dd4748626f1e075df6bc39e6f (patch)
treeb00259888790f02b06936cec1b2ee8baa99796b9
parent0ae7acabf284c0378f476c540e02161e09524989 (diff)
downloadchef-c32cb1c97adfb73dd4748626f1e075df6bc39e6f.tar.gz
Bump version of chef to 12.19.21 by Chef Versioner.v12.19.21
-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 49f00d3968..3a450078f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,11 @@
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.19.20](https://github.com/chef/chef/tree/v12.19.20) (2017-02-10)
-[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.20)
+## [v12.19.21](https://github.com/chef/chef/tree/v12.19.21) (2017-02-10)
+[Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.21)
**Merged pull requests:**
+- Suppress sensitive properties from resource log and reporting output [\#5803](https://github.com/chef/chef/pull/5803) ([tduffield](https://github.com/tduffield))
- Sanitize UTF-8 data sent to Data Collector [\#5793](https://github.com/chef/chef/pull/5793) ([lamont-granquist](https://github.com/lamont-granquist))
- Add mutlipackage\_api support to yum\_package provider [\#5791](https://github.com/chef/chef/pull/5791) ([tduffield](https://github.com/tduffield))
- rhel7 / dnf 2.0 fixes / improved errors [\#5782](https://github.com/chef/chef/pull/5782) ([lamont-granquist](https://github.com/lamont-granquist))
diff --git a/Gemfile.lock b/Gemfile.lock
index 55c78197a9..01d06a0277 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -46,10 +46,10 @@ GIT
PATH
remote: .
specs:
- chef (12.19.20)
+ chef (12.19.21)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.20)
+ chef-config (= 12.19.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -75,10 +75,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (12.19.20-universal-mingw32)
+ chef (12.19.21-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 12.19.20)
+ chef-config (= 12.19.21)
chef-zero (>= 4.8)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -119,7 +119,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (12.19.20)
+ chef-config (12.19.21)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 109fd7b9bc..46d73b0563 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.19.20 \ No newline at end of file
+12.19.21 \ 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 2f7efac333..b6568685be 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.19.20"
+ VERSION = "12.19.21"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c16ddbd795..8f5ddb7faa 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.19.20"
+ VERSION = "12.19.21"
end
#