diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-04-14 15:15:19 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-04-14 15:15:19 +0000 |
| commit | 7c1c0b125689526f559970a45e869ae967d2b3e3 (patch) | |
| tree | f8a2b0b7841075f635d17011095c7b0ec0c0fdef | |
| parent | 3770466481559b92f9200a92590a02cffaa6c594 (diff) | |
| download | chef-7c1c0b125689526f559970a45e869ae967d2b3e3.tar.gz | |
Bump version to 14.0.202 by Expeditorv14.0.202
| -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 8e66c3b2d5..9f0d61dd6a 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.201 --> -## [v14.0.201](https://github.com/chef/chef/tree/v14.0.201) (2018-04-14) +<!-- latest_release 14.0.202 --> +## [v14.0.202](https://github.com/chef/chef/tree/v14.0.202) (2018-04-14) #### Merged Pull Requests -- add support for lock bot [#7136](https://github.com/chef/chef/pull/7136) ([lamont-granquist](https://github.com/lamont-granquist)) +- Catch json.load exceptions causing syslog errors [#7155](https://github.com/chef/chef/pull/7155) ([tomdoherty](https://github.com/tomdoherty)) <!-- latest_release --> <!-- release_rollup since=14.0.190 --> ### Changes since 14.0.190 release #### Merged Pull Requests +- Catch json.load exceptions causing syslog errors [#7155](https://github.com/chef/chef/pull/7155) ([tomdoherty](https://github.com/tomdoherty)) <!-- 14.0.202 --> - add support for lock bot [#7136](https://github.com/chef/chef/pull/7136) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.201 --> - bump omnibus [#7157](https://github.com/chef/chef/pull/7157) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.200 --> - add the resources() dsl method back to providers [#7152](https://github.com/chef/chef/pull/7152) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.199 --> diff --git a/Gemfile.lock b/Gemfile.lock index da35a39426..6cf802bda2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,10 +15,10 @@ GIT PATH remote: . specs: - chef (14.0.201) + chef (14.0.202) addressable bundler (>= 1.10) - chef-config (= 14.0.201) + chef-config (= 14.0.202) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -45,10 +45,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.201-universal-mingw32) + chef (14.0.202-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.201) + chef-config (= 14.0.202) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -90,7 +90,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.201) + chef-config (14.0.202) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.201
\ No newline at end of file +14.0.202
\ 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 317d19c650..f2696579af 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.201" + VERSION = "14.0.202" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 0371cd4570..523400e332 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.201") + VERSION = Chef::VersionString.new("14.0.202") end # |