diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 16 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ae1b282af6..b6c23086c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.59 --> -## [v14.0.59](https://github.com/chef/chef/tree/v14.0.59) (2018-02-15) +<!-- latest_release 14.0.60 --> +## [v14.0.60](https://github.com/chef/chef/tree/v14.0.60) (2018-02-19) #### Merged Pull Requests -- Use the updated inspec gem - 1.51.18 [#6845](https://github.com/chef/chef/pull/6845) ([tas50](https://github.com/tas50)) +- registry_key: Add sensitive property support for suppressing output (fixes #5695) [#6496](https://github.com/chef/chef/pull/6496) ([shoekstra](https://github.com/shoekstra)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- registry_key: Add sensitive property support for suppressing output (fixes #5695) [#6496](https://github.com/chef/chef/pull/6496) ([shoekstra](https://github.com/shoekstra)) <!-- 14.0.60 --> - Use the updated inspec gem - 1.51.18 [#6845](https://github.com/chef/chef/pull/6845) ([tas50](https://github.com/tas50)) <!-- 14.0.59 --> - add Chef::NodeMap#delete_class API [#6846](https://github.com/chef/chef/pull/6846) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.58 --> - only run windows env specs on windows [#6850](https://github.com/chef/chef/pull/6850) ([thommay](https://github.com/thommay)) <!-- 14.0.57 --> diff --git a/Gemfile.lock b/Gemfile.lock index 0084528c75..8d83200775 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,11 +8,11 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: f2b345a4314a19929fe7271bd3eaee1f590a695f + revision: 034a8a2f2ebccfc50657b8a79d73deeca4c27b17 branch: master specs: - ohai (14.0.2) - chef-config (>= 12.5.0.alpha.1, < 15) + ohai (14.0.12) + chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.59) + chef (14.0.60) addressable bundler (>= 1.10) - chef-config (= 14.0.59) + chef-config (= 14.0.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.59-universal-mingw32) + chef (14.0.60-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.59) + chef-config (= 14.0.60) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.59) + chef-config (14.0.60) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.59
\ No newline at end of file +14.0.60
\ 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 0eec0edb1e..b378970758 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.0.59" + VERSION = "14.0.60" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 81841dd762..7aaaf7602a 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.0.59") + VERSION = Chef::VersionString.new("14.0.60") end # |