diff options
| author | Chef Expeditor <chef-ci@chef.io> | 2018-09-25 17:41:23 +0000 |
|---|---|---|
| committer | Chef Expeditor <chef-ci@chef.io> | 2018-09-25 17:41:23 +0000 |
| commit | 949776a740d494740bbd6904f62c8856fd47a87a (patch) | |
| tree | 7d84f8874cd2e01ffd1df64ea4246f9083f9895d | |
| parent | 81e358aa1b5e38377a11ea80b903e5acb257118a (diff) | |
| download | chef-949776a740d494740bbd6904f62c8856fd47a87a.tar.gz | |
Bump version to 14.6.1 by Chef Expeditorv14.6.1
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 dc03a65561..755fbdf9fd 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.0 --> -## [v14.6.0](https://github.com/chef/chef/tree/v14.6.0) (2018-09-25) +<!-- latest_release 14.6.1 --> +## [v14.6.1](https://github.com/chef/chef/tree/v14.6.1) (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)) +- Bump chef-vault to 3.4.2 [#7675](https://github.com/chef/chef/pull/7675) ([chef-ci](https://github.com/chef-ci)) <!-- latest_release --> <!-- release_rollup since=14.5.33 --> ### Changes since 14.5.33 release #### Merged Pull Requests +- Bump chef-vault to 3.4.2 [#7675](https://github.com/chef/chef/pull/7675) ([chef-ci](https://github.com/chef-ci)) <!-- 14.6.1 --> - 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 --> diff --git a/Gemfile.lock b/Gemfile.lock index 579797bdd6..681a8a6fa1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.6.0) + chef (14.6.1) addressable bundler (>= 1.10) - chef-config (= 14.6.0) + chef-config (= 14.6.1) 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.0-universal-mingw32) + chef (14.6.1-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.6.0) + chef-config (= 14.6.1) 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.0) + chef-config (14.6.1) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.6.0
\ No newline at end of file +14.6.1
\ 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 d4d85011fc..d75413b30c 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.0".freeze + VERSION = "14.6.1".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index e9b2b2e60f..9895ead03f 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.0") + VERSION = Chef::VersionString.new("14.6.1") end # |