diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-04-07 01:44:26 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-04-07 01:44:26 +0000 |
| commit | e7540855ccd0606b5ffc256b66d280da08555c54 (patch) | |
| tree | 52a1baa6c70f20851047cd4bd5e81369a04fda2f | |
| parent | e57d19baffa102a03f709141551c0bf413ae1a89 (diff) | |
| download | chef-e7540855ccd0606b5ffc256b66d280da08555c54.tar.gz | |
Bump version to 14.0.193 by Expeditorv14.0.193
| -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 d6af315b54..849399ba8c 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.192 --> -## [v14.0.192](https://github.com/chef/chef/tree/v14.0.192) (2018-04-05) +<!-- latest_release 14.0.193 --> +## [v14.0.193](https://github.com/chef/chef/tree/v14.0.193) (2018-04-07) #### Merged Pull Requests -- add delegator for property_is_set? to providers [#7122](https://github.com/chef/chef/pull/7122) ([lamont-granquist](https://github.com/lamont-granquist)) +- Modify the provides for all resources from cookbooks so chef wins [#7134](https://github.com/chef/chef/pull/7134) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.0.190 --> ### Changes since 14.0.190 release #### Merged Pull Requests +- Modify the provides for all resources from cookbooks so chef wins [#7134](https://github.com/chef/chef/pull/7134) ([tas50](https://github.com/tas50)) <!-- 14.0.193 --> - add delegator for property_is_set? to providers [#7122](https://github.com/chef/chef/pull/7122) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.192 --> - Update InSpec to 2.1.21 [#7109](https://github.com/chef/chef/pull/7109) ([tas50](https://github.com/tas50)) <!-- 14.0.191 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index c005f97e60..64c8ca43da 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GIT PATH remote: . specs: - chef (14.0.192) + chef (14.0.193) addressable bundler (>= 1.10) - chef-config (= 14.0.192) + chef-config (= 14.0.193) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -45,10 +45,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.192-universal-mingw32) + chef (14.0.193-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.192) + chef-config (= 14.0.193) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -90,7 +90,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.192) + chef-config (14.0.193) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.192
\ No newline at end of file +14.0.193
\ 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 2f3c8799b6..bd5dd60574 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.192" + VERSION = "14.0.193" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 1670a2f19e..1e3485bfb0 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.192") + VERSION = Chef::VersionString.new("14.0.193") end # |