diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-05-29 21:37:30 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-05-29 21:37:30 +0000 |
commit | 815481f7a5d6928da638e1353e2ef8bfa76fb66f (patch) | |
tree | 353fa5a3f7d53619bccb83a0d03b914d86de9c96 | |
parent | dfe9dde990dc6e95d514d47ed7b94b480c155208 (diff) | |
download | chef-815481f7a5d6928da638e1353e2ef8bfa76fb66f.tar.gz |
Bump version to 14.12.14 by Chef Expeditorv14.12.14
Obvious fix; these changes are the result of automation not creative thinking.
-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 512163f4a3..c62c4bcce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.12.13 --> -## [v14.12.13](https://github.com/chef/chef/tree/v14.12.13) (2019-05-29) +<!-- latest_release 14.12.14 --> +## [v14.12.14](https://github.com/chef/chef/tree/v14.12.14) (2019-05-29) #### Merged Pull Requests -- Update openssl to 1.0.2s [#8601](https://github.com/chef/chef/pull/8601) ([tas50](https://github.com/tas50)) +- Fix delete_resource for resources [#8602](https://github.com/chef/chef/pull/8602) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.12.9 --> ### Changes since 14.12.9 release #### Merged Pull Requests +- Fix delete_resource for resources [#8602](https://github.com/chef/chef/pull/8602) ([tas50](https://github.com/tas50)) <!-- 14.12.14 --> - Update openssl to 1.0.2s [#8601](https://github.com/chef/chef/pull/8601) ([tas50](https://github.com/tas50)) <!-- 14.12.13 --> - Fix service enable idempotency in sles11 (#8256) [#8587](https://github.com/chef/chef/pull/8587) ([btm](https://github.com/btm)) <!-- 14.12.12 --> - Remove resource collision deprecations [#8511](https://github.com/chef/chef/pull/8511) ([tas50](https://github.com/tas50)) <!-- 14.12.11 --> diff --git a/Gemfile.lock b/Gemfile.lock index 2686367c74..2d20847088 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.12.13) + chef (14.12.14) addressable bundler (>= 1.10) - chef-config (= 14.12.13) + chef-config (= 14.12.14) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -31,10 +31,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.12.13-universal-mingw32) + chef (14.12.14-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.12.13) + chef-config (= 14.12.14) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -77,7 +77,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.12.13) + chef-config (14.12.14) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.12.13
\ No newline at end of file +14.12.14
\ 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 78ee581d65..e93186b766 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.12.13".freeze + VERSION = "14.12.14".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index cfdcbbfd99..65d498e8eb 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.12.13") + VERSION = Chef::VersionString.new("14.12.14") end # |