diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-08-09 10:44:40 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-08-09 10:44:40 +0000 |
| commit | 7372d0ece166ee0d5a3e25bf84861807995e58be (patch) | |
| tree | 05a96a31190a1ac8f5f255611ca14951360c31f8 | |
| parent | 4b39f019ac84574515696ef0a644b8a226a0e2e2 (diff) | |
| download | chef-7372d0ece166ee0d5a3e25bf84861807995e58be.tar.gz | |
Bump version to 13.3.36 by Chef Expeditorv13.3.36
| -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 7a9d7c1ace..778b6ade32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,15 @@ -<!-- latest_release 13.3.35 --> -## [v13.3.35](https://github.com/chef/chef/tree/v13.3.35) (2017-08-08) +<!-- latest_release 13.3.36 --> +## [v13.3.36](https://github.com/chef/chef/tree/v13.3.36) (2017-08-09) #### Merged Pull Requests -- Bump omnibus-software version [#6310](https://github.com/chef/chef/pull/6310) ([thommay](https://github.com/thommay)) +- throw readable errors if multiple dsc resources are found [#6307](https://github.com/chef/chef/pull/6307) ([Happycoil](https://github.com/Happycoil)) <!-- latest_release --> <!-- release_rollup since=13.2.20 --> ### Changes since 13.2.20 release #### Merged Pull Requests +- throw readable errors if multiple dsc resources are found [#6307](https://github.com/chef/chef/pull/6307) ([Happycoil](https://github.com/Happycoil)) <!-- 13.3.36 --> - Bump omnibus-software version [#6310](https://github.com/chef/chef/pull/6310) ([thommay](https://github.com/thommay)) <!-- 13.3.35 --> - add option to enable unprivileged symlink creation on windows [#6236](https://github.com/chef/chef/pull/6236) ([svmastersamurai](https://github.com/svmastersamurai)) <!-- 13.3.34 --> - Fix git command in DCO sign-off example [#6306](https://github.com/chef/chef/pull/6306) ([edmorley](https://github.com/edmorley)) <!-- 13.3.33 --> diff --git a/Gemfile.lock b/Gemfile.lock index b95c57741e..451a466172 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.3.35) + chef (13.3.36) addressable bundler (>= 1.10) - chef-config (= 13.3.35) + chef-config (= 13.3.36) 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.35-universal-mingw32) + chef (13.3.36-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.3.35) + chef-config (= 13.3.36) 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.35) + chef-config (13.3.36) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.3.35
\ No newline at end of file +13.3.36
\ 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 33fa62d86a..00002fbe9b 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.35" + VERSION = "13.3.36" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 682463ca0d..21724c60ed 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.35") + VERSION = Chef::VersionString.new("13.3.36") end # |