diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-15 18:01:07 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-15 18:01:07 +0000 |
commit | 3522c00ad457fd7caf6b5f80a29ab0c4a25ff253 (patch) | |
tree | 8011875744ae8418a48dc5a1a85a200fcdaf642a | |
parent | 6eb849fbdf9e84b90d6e8218179ff70520d3accf (diff) | |
download | chef-3522c00ad457fd7caf6b5f80a29ab0c4a25ff253.tar.gz |
Bump version to 14.0.135 by Expeditorv14.0.135
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-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, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f786b0909..0bb46a8dde 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.134 --> -## [v14.0.134](https://github.com/chef/chef/tree/v14.0.134) (2018-03-15) +<!-- latest_release 14.0.135 --> +## [v14.0.135](https://github.com/chef/chef/tree/v14.0.135) (2018-03-15) #### Merged Pull Requests -- Stripping out Authorization header on redirect to a different host [#6985](https://github.com/chef/chef/pull/6985) ([bugok](https://github.com/bugok)) +- Remove knife help which used the manpages [#6982](https://github.com/chef/chef/pull/6982) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- 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 --> - Require Ruby 2.4+ [#6983](https://github.com/chef/chef/pull/6983) ([tas50](https://github.com/tas50)) <!-- 14.0.132 --> diff --git a/Gemfile.lock b/Gemfile.lock index a4522cff57..e10711f1c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: df58c0ea31653c9ca601ce4154fc964946b27455 + revision: 65b2ee96ae77a7498b21663181b9c524e1235e26 branch: master specs: - ohai (14.0.25) + ohai (14.0.26) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (14.0.134) + chef (14.0.135) addressable bundler (>= 1.10) - chef-config (= 14.0.134) + chef-config (= 14.0.135) 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.134-universal-mingw32) + chef (14.0.135-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.134) + chef-config (= 14.0.135) 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.134) + chef-config (14.0.135) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.134
\ No newline at end of file +14.0.135
\ 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 3c04128799..b01296ea59 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.134" + VERSION = "14.0.135" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 52dc88e964..a3488c4f9f 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.134") + VERSION = Chef::VersionString.new("14.0.135") end # |