diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-08-17 17:10:21 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-08-17 17:10:21 +0000 |
commit | ce06d947971624275f7138a4c9b2f1ea0b4b65be (patch) | |
tree | f738616a6f6b2988329b4ea1c92ec6e385483447 | |
parent | 50baef2008601b669b70ee6293d920d2b088b930 (diff) | |
download | chef-ce06d947971624275f7138a4c9b2f1ea0b4b65be.tar.gz |
Bump version to 13.3.50 by Chef Expeditorv13.3.50
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b2b8ca0e..c177433b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -<!-- latest_release 13.3.49 --> -## [v13.3.49](https://github.com/chef/chef/tree/v13.3.49) (2017-08-17) +<!-- latest_release 13.3.50 --> +## [v13.3.50](https://github.com/chef/chef/tree/v13.3.50) (2017-08-17) #### Merged Pull Requests -- Add Chef 13.0.113 and 13.0.118 to the changelog [#6334](https://github.com/chef/chef/pull/6334) ([tas50](https://github.com/tas50)) +- Add v12.21.4 to master's changelog [#6339](https://github.com/chef/chef/pull/6339) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.3.42 --> @@ -12,6 +12,7 @@ - Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 --> #### Merged Pull Requests +- Add v12.21.4 to master's changelog [#6339](https://github.com/chef/chef/pull/6339) ([tas50](https://github.com/tas50)) <!-- 13.3.50 --> - Add Chef 13.0.113 and 13.0.118 to the changelog [#6334](https://github.com/chef/chef/pull/6334) ([tas50](https://github.com/tas50)) <!-- 13.3.49 --> - Add windows_path resource from the Windows cookbook [#6295](https://github.com/chef/chef/pull/6295) ([NimishaS](https://github.com/NimishaS)) <!-- 13.3.48 --> - Add more items to the 13.3 release notes [#6325](https://github.com/chef/chef/pull/6325) ([tas50](https://github.com/tas50)) <!-- 13.3.43 --> @@ -1563,4 +1564,4 @@ of partial templates. * Fixed a bug where nested resources that inherited from Resource::LWRPBase would not share the same actions/default_action as their parent * Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional) -* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) +* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 60086edeb9..7c1de87251 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.3.49) + chef (13.3.50) addressable bundler (>= 1.10) - chef-config (= 13.3.49) + chef-config (= 13.3.50) 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.3.49-universal-mingw32) + chef (13.3.50-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.3.49) + chef-config (= 13.3.50) 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.3.49) + chef-config (13.3.50) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.3.49
\ No newline at end of file +13.3.50
\ 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 3dd7963100..d0215da391 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -20,7 +20,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "13.3.49" + VERSION = "13.3.50" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 9b2ded1cb7..04d9f95dcb 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -22,7 +22,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("13.3.49") + VERSION = Chef::VersionString.new("13.3.50") end # |