diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-10-09 20:05:17 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-10-09 20:05:17 +0000 |
commit | 416bc67643848758c5fc8ccb0d470674cb6612d6 (patch) | |
tree | 78ca45b4e1c8008e8b553155578dd99dbe7e0f45 | |
parent | a10c591a708a4745dcd7c493e0c2d577ef55353a (diff) | |
download | chef-416bc67643848758c5fc8ccb0d470674cb6612d6.tar.gz |
Bump version to 14.6.18 by Chef Expeditorv14.6.18
Obvious fix; these changes are the result of automation not creative thinking.
-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 39626f6f39..355fb7024e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.6.17 --> -## [v14.6.17](https://github.com/chef/chef/tree/v14.6.17) (2018-10-06) +<!-- latest_release 14.6.18 --> +## [v14.6.18](https://github.com/chef/chef/tree/v14.6.18) (2018-10-09) #### Merged Pull Requests -- Only include the Windows distro files on Windows [#7727](https://github.com/chef/chef/pull/7727) ([tas50](https://github.com/tas50)) +- Add the timezone resource from the timezone_lwrp cookbook [#7736](https://github.com/chef/chef/pull/7736) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.5.33 --> ### Changes since 14.5.33 release #### Merged Pull Requests +- Add the timezone resource from the timezone_lwrp cookbook [#7736](https://github.com/chef/chef/pull/7736) ([tas50](https://github.com/tas50)) <!-- 14.6.18 --> - Only include the Windows distro files on Windows [#7727](https://github.com/chef/chef/pull/7727) ([tas50](https://github.com/tas50)) <!-- 14.6.17 --> - Cleanup the Test Kitchen setup in omnibus [#7726](https://github.com/chef/chef/pull/7726) ([tas50](https://github.com/tas50)) <!-- 14.6.16 --> - better docs for Chef::Knife::Bootstrap#validate_options! [#7719](https://github.com/chef/chef/pull/7719) ([bankair](https://github.com/bankair)) <!-- 14.6.15 --> diff --git a/Gemfile.lock b/Gemfile.lock index da758eb840..7652b04e12 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.6.17) + chef (14.6.18) addressable bundler (>= 1.10) - chef-config (= 14.6.17) + chef-config (= 14.6.18) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.6.17-universal-mingw32) + chef (14.6.18-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.6.17) + chef-config (= 14.6.18) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.6.17) + chef-config (14.6.18) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.6.17
\ No newline at end of file +14.6.18
\ 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 bb0e285341..13d266c1dc 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.6.17".freeze + VERSION = "14.6.18".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 274f6323bc..08c3470bb3 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.6.17") + VERSION = Chef::VersionString.new("14.6.18") end # |