diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-15 18:04:56 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-15 18:04:56 +0000 |
commit | fb61966bbc7a2d8920d772ff7f3f3fc8543b107d (patch) | |
tree | 785739fa6d6d3edbf8a6bff5fe2c727bc530dc44 | |
parent | fdd3511a1107bf5cea50ca139a604206485b3f1c (diff) | |
download | chef-fb61966bbc7a2d8920d772ff7f3f3fc8543b107d.tar.gz |
Bump version to 14.0.136 by Expeditorv14.0.136
-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 0bb46a8dde..5c9a9e9a58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.0.135 --> -## [v14.0.135](https://github.com/chef/chef/tree/v14.0.135) (2018-03-15) +<!-- latest_release 14.0.136 --> +## [v14.0.136](https://github.com/chef/chef/tree/v14.0.136) (2018-03-15) #### Merged Pull Requests -- Remove knife help which used the manpages [#6982](https://github.com/chef/chef/pull/6982) ([tas50](https://github.com/tas50)) +- update mount to use properties and fix 6851 [#6969](https://github.com/chef/chef/pull/6969) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- update mount to use properties and fix 6851 [#6969](https://github.com/chef/chef/pull/6969) ([thommay](https://github.com/thommay)) <!-- 14.0.136 --> - Remove knife help which used the manpages [#6982](https://github.com/chef/chef/pull/6982) ([tas50](https://github.com/tas50)) <!-- 14.0.135 --> - Stripping out Authorization header on redirect to a different host [#6985](https://github.com/chef/chef/pull/6985) ([bugok](https://github.com/bugok)) <!-- 14.0.134 --> - Pass pointer to LsaFreeMemory, not FFI::MemoryPointer [#6980](https://github.com/chef/chef/pull/6980) ([btm](https://github.com/btm)) <!-- 14.0.133 --> diff --git a/Gemfile.lock b/Gemfile.lock index e10711f1c2..8e2326dc23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (14.0.135) + chef (14.0.136) addressable bundler (>= 1.10) - chef-config (= 14.0.135) + chef-config (= 14.0.136) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -57,10 +57,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.135-universal-mingw32) + chef (14.0.136-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.135) + chef-config (= 14.0.136) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -102,7 +102,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.135) + chef-config (14.0.136) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.135
\ No newline at end of file +14.0.136
\ 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 b01296ea59..a2d8aaa9fb 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.0.135" + VERSION = "14.0.136" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a3488c4f9f..ebd07fc262 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.0.135") + VERSION = Chef::VersionString.new("14.0.136") end # |