diff options
| -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 e7bde0d72a..4d3afe6bd3 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.169 --> -## [v14.0.169](https://github.com/chef/chef/tree/v14.0.169) (2018-03-27) +<!-- latest_release 14.0.170 --> +## [v14.0.170](https://github.com/chef/chef/tree/v14.0.170) (2018-03-27) #### Merged Pull Requests -- Update openssl to 1.0.2o [#7075](https://github.com/chef/chef/pull/7075) ([tas50](https://github.com/tas50)) +- Add / update resource descriptions [#7073](https://github.com/chef/chef/pull/7073) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.8.5 --> ### Changes since 13.8.5 release #### Merged Pull Requests +- Add / update resource descriptions [#7073](https://github.com/chef/chef/pull/7073) ([tas50](https://github.com/tas50)) <!-- 14.0.170 --> - Update openssl to 1.0.2o [#7075](https://github.com/chef/chef/pull/7075) ([tas50](https://github.com/tas50)) <!-- 14.0.169 --> - Update information on updating gems / Expeditor [#7057](https://github.com/chef/chef/pull/7057) ([tas50](https://github.com/tas50)) <!-- 14.0.168 --> - Ship InSpec 2 [#7051](https://github.com/chef/chef/pull/7051) ([thommay](https://github.com/thommay)) <!-- 14.0.167 --> diff --git a/Gemfile.lock b/Gemfile.lock index be4b987eb0..0413eda1e8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GIT PATH remote: . specs: - chef (14.0.169) + chef (14.0.170) addressable bundler (>= 1.10) - chef-config (= 14.0.169) + chef-config (= 14.0.170) 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.169-universal-mingw32) + chef (14.0.170-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.169) + chef-config (= 14.0.170) 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.169) + chef-config (14.0.170) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.169
\ No newline at end of file +14.0.170
\ 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 50fe2d8c30..ebaf7b9a53 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.169" + VERSION = "14.0.170" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index b7cfcd673a..dc521d7fb9 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.169") + VERSION = Chef::VersionString.new("14.0.170") end # |