diff options
| author | Chef Expeditor <chef-ci@chef.io> | 2018-09-25 17:36:23 +0000 |
|---|---|---|
| committer | Chef Expeditor <chef-ci@chef.io> | 2018-09-25 17:36:23 +0000 |
| commit | b5e05b699fa5a6bd914dd04e6993513b462c7220 (patch) | |
| tree | 1ccdf578fcf90c365ff492666cf334fc4b55d554 | |
| parent | e53ed456e6f7a99ac05c8842481b6e4c681f591b (diff) | |
| download | chef-14.6.0.tar.gz | |
Bump version to 14.6.0 by Chef Expeditorv14.6.0
Obvious fix; these changes are the result of automation not creative thinking.
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -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, 21 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a16674e8..dc03a65561 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release --> +<!-- latest_release 14.6.0 --> +## [v14.6.0](https://github.com/chef/chef/tree/v14.6.0) (2018-09-25) + +#### Merged Pull Requests +- zypper_package: Add new global_options property [#7518](https://github.com/chef/chef/pull/7518) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=14.5.33 --> +### Changes since 14.5.33 release + +#### Merged Pull Requests +- zypper_package: Add new global_options property [#7518](https://github.com/chef/chef/pull/7518) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.6.0 --> <!-- release_rollup --> <!-- latest_stable_release --> diff --git a/Gemfile.lock b/Gemfile.lock index 23d545cf46..1d99135e6d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.5.33) + chef (14.6.0) addressable bundler (>= 1.10) - chef-config (= 14.5.33) + chef-config (= 14.6.0) 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.5.33-universal-mingw32) + chef (14.6.0-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.5.33) + chef-config (= 14.6.0) 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.5.33) + chef-config (14.6.0) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -201,7 +201,7 @@ GEM net-ssh-multi (1.2.1) net-ssh (>= 2.6.5) net-ssh-gateway (>= 1.2.0) - net-telnet (0.2.0) + net-telnet (0.1.1) netrc (0.11.0) octokit (4.12.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -290,10 +290,10 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) slop (3.6.0) - specinfra (2.76.1) + specinfra (2.76.2) net-scp net-ssh (>= 2.7) - net-telnet + net-telnet (= 0.1.1) sfl sslshake (1.2.0) structured_warnings (0.3.0) @@ -1 +1 @@ -14.5.33
\ No newline at end of file +14.6.0
\ 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 8586da9876..d4d85011fc 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.5.33".freeze + VERSION = "14.6.0".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index c61b6ecdb1..e9b2b2e60f 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.5.33") + VERSION = Chef::VersionString.new("14.6.0") end # |