diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-19 17:31:53 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-02-19 17:31:53 +0000 |
commit | 3ee91155637400efeb2886a99fc8afddc0dc247a (patch) | |
tree | dc7662a21a335103dd4c6c20a166e0d81a707813 | |
parent | 9a2ba654492fd53f05f3f363badbebb26f7bf70f (diff) | |
download | chef-3ee91155637400efeb2886a99fc8afddc0dc247a.tar.gz |
Bump version to 14.0.61 by Expeditorv14.0.61
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-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, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b6c23086c7..ae45e5e667 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.60 --> -## [v14.0.60](https://github.com/chef/chef/tree/v14.0.60) (2018-02-19) +<!-- latest_release 14.0.61 --> +## [v14.0.61](https://github.com/chef/chef/tree/v14.0.61) (2018-02-19) #### 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)) +- Add hostname resource from chef_hostname cookbook [#6795](https://github.com/chef/chef/pull/6795) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- Add hostname resource from chef_hostname cookbook [#6795](https://github.com/chef/chef/pull/6795) ([tas50](https://github.com/tas50)) <!-- 14.0.61 --> - 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 --> diff --git a/Gemfile.lock b/Gemfile.lock index 8d83200775..c942c1f214 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.60) + chef (14.0.61) addressable bundler (>= 1.10) - chef-config (= 14.0.60) + chef-config (= 14.0.61) 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.60-universal-mingw32) + chef (14.0.61-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.60) + chef-config (= 14.0.61) 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.60) + chef-config (14.0.61) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.60
\ No newline at end of file +14.0.61
\ 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 b378970758..cc34f28910 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.60" + VERSION = "14.0.61" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 7aaaf7602a..72efa3b085 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.60") + VERSION = Chef::VersionString.new("14.0.61") end # |