diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-22 19:22:55 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-22 19:22:55 +0000 |
commit | 6664a22bae21caea867ca1ee059adc62e66f0ff8 (patch) | |
tree | 192af72e06117a22683c14acce636e78f21295cc | |
parent | a45c3381c8a2ce4044732340eb9de07ae0253adf (diff) | |
download | chef-6664a22bae21caea867ca1ee059adc62e66f0ff8.tar.gz |
Bump version to 13.6.11 by Expeditorv13.6.11
-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 3a89a8c202..ca674e1870 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.6.10 --> -## [v13.6.10](https://github.com/chef/chef/tree/v13.6.10) (2017-11-21) +<!-- latest_release 13.6.11 --> +## [v13.6.11](https://github.com/chef/chef/tree/v13.6.11) (2017-11-22) #### Merged Pull Requests -- Revert "add missing functional tests for users" [#6588](https://github.com/chef/chef/pull/6588) ([lamont-granquist](https://github.com/lamont-granquist)) +- Fix variable name in solaris service provider [#6596](https://github.com/chef/chef/pull/6596) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Fix variable name in solaris service provider [#6596](https://github.com/chef/chef/pull/6596) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 13.6.11 --> - Revert "add missing functional tests for users" [#6588](https://github.com/chef/chef/pull/6588) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.10 --> - Filter out periods from tmux session name [#6593](https://github.com/chef/chef/pull/6593) ([afn](https://github.com/afn)) <!-- 13.6.9 --> - Fix mount test, also update ifconfig to work with both common versions. [#6587](https://github.com/chef/chef/pull/6587) ([scotthain](https://github.com/scotthain)) <!-- 13.6.8 --> diff --git a/Gemfile.lock b/Gemfile.lock index ec1ff2377b..61619ae4b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.6.10) + chef (13.6.11) addressable bundler (>= 1.10) - chef-config (= 13.6.10) + chef-config (= 13.6.11) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -47,10 +47,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.6.10-universal-mingw32) + chef (13.6.11-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.6.10) + chef-config (= 13.6.11) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.6.10) + chef-config (13.6.11) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.6.10
\ No newline at end of file +13.6.11
\ 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 ca0b8d22bd..1359f95633 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.6.10" + VERSION = "13.6.11" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index f8427d276d..c17b044e1a 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.6.10") + VERSION = Chef::VersionString.new("13.6.11") end # |