diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-07-07 13:44:39 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-07-07 13:44:39 +0000 |
| commit | 32e02d9f7a05c5f2d734606a5185666443306e22 (patch) | |
| tree | ab861ceabe9914c19d897372e326dd7969ad54de | |
| parent | a821e447763e099b08a724d5b140bb9671e88baf (diff) | |
| download | chef-32e02d9f7a05c5f2d734606a5185666443306e22.tar.gz | |
Bump version to 13.9.6 by Chef Expeditorv13.9.6
| -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 a237f19125..480a34149e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.9.5 --> -## [v13.9.5](https://github.com/chef/chef/tree/v13.9.5) (2018-07-06) +<!-- latest_release 13.9.6 --> +## [v13.9.6](https://github.com/chef/chef/tree/v13.9.6) (2018-07-07) #### Merged Pull Requests -- Trying to use --recipe-url on Windows with local file fails [#7426](https://github.com/chef/chef/pull/7426) ([tyler-ball](https://github.com/tyler-ball)) +- Pull in latest win32-service gem [#7432](https://github.com/chef/chef/pull/7432) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.9.4 --> ### Changes since 13.9.4 release #### Merged Pull Requests +- Pull in latest win32-service gem [#7432](https://github.com/chef/chef/pull/7432) ([tas50](https://github.com/tas50)) <!-- 13.9.6 --> - Trying to use --recipe-url on Windows with local file fails [#7426](https://github.com/chef/chef/pull/7426) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.9.5 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index 35265971a2..0571ecc6d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (13.9.5) + chef (13.9.6) addressable bundler (>= 1.10) - chef-config (= 13.9.5) + chef-config (= 13.9.6) chef-zero (~> 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -39,10 +39,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.9.5-universal-mingw32) + chef (13.9.6-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.9.5) + chef-config (= 13.9.6) chef-zero (~> 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -84,7 +84,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.9.5) + chef-config (13.9.6) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.9.5
\ No newline at end of file +13.9.6
\ 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 4b7bc3ef9c..a717078702 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 = "13.9.5" + VERSION = "13.9.6" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 1f45ad82e5..d0e79ba31b 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("13.9.5") + VERSION = Chef::VersionString.new("13.9.6") end # |