diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-18 18:32:34 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-12-18 18:32:34 +0000 |
| commit | abdfb00bac4cf6c920462afe8dd3d6f86ad5d974 (patch) | |
| tree | 6fb0bc5f7ce8bb3bac4271400d7f6157c5952ab6 | |
| parent | 925051d67b36a2b6c6a13c99cccf4109e99987f5 (diff) | |
| download | chef-abdfb00bac4cf6c920462afe8dd3d6f86ad5d974.tar.gz | |
Bump version to 13.6.42 by Expeditorv13.6.42
| -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 1e2f619b75..edee473294 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.41 --> -## [v13.6.41](https://github.com/chef/chef/tree/v13.6.41) (2017-12-18) +<!-- latest_release 13.6.42 --> +## [v13.6.42](https://github.com/chef/chef/tree/v13.6.42) (2017-12-18) #### Merged Pull Requests -- Modernize reboot resource and add spec [#6683](https://github.com/chef/chef/pull/6683) ([tas50](https://github.com/tas50)) +- implement credential management [#6660](https://github.com/chef/chef/pull/6660) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- implement credential management [#6660](https://github.com/chef/chef/pull/6660) ([thommay](https://github.com/thommay)) <!-- 13.6.42 --> - Modernize reboot resource and add spec [#6683](https://github.com/chef/chef/pull/6683) ([tas50](https://github.com/tas50)) <!-- 13.6.41 --> - Fix bugs in handling 'source' in msu_package and cab_package [#6686](https://github.com/chef/chef/pull/6686) ([tas50](https://github.com/tas50)) <!-- 13.6.40 --> - Move docker and git top cookbook tests to travis [#6673](https://github.com/chef/chef/pull/6673) ([scotthain](https://github.com/scotthain)) <!-- 13.6.39 --> diff --git a/Gemfile.lock b/Gemfile.lock index e9881a050f..3f98a9dfdf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.6.41) + chef (13.6.42) addressable bundler (>= 1.10) - chef-config (= 13.6.41) + chef-config (= 13.6.42) 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.41-universal-mingw32) + chef (13.6.42-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.6.41) + chef-config (= 13.6.42) 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.41) + chef-config (13.6.42) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.6.41
\ No newline at end of file +13.6.42
\ 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 e7f079285c..1143546303 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.41" + VERSION = "13.6.42" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ba5dc4ae1e..958a0b32cf 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.41") + VERSION = Chef::VersionString.new("13.6.42") end # |