diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-24 18:11:43 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-01-24 18:11:43 +0000 |
| commit | 8324a3f2acabe056bbab2405ae7765f36a64a7c8 (patch) | |
| tree | 68698f2984135b84362e3248a281128080ad3cfe | |
| parent | 781b33124b3689431602613f6a8ac22842344d8b (diff) | |
| download | chef-8324a3f2acabe056bbab2405ae7765f36a64a7c8.tar.gz | |
Bump version to 14.0.25 by Expeditorv14.0.25
| -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 e4aa674fcb..42e0d0bb9f 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.24 --> -## [v14.0.24](https://github.com/chef/chef/tree/v14.0.24) (2018-01-24) +<!-- latest_release 14.0.25 --> +## [v14.0.25](https://github.com/chef/chef/tree/v14.0.25) (2018-01-24) #### Merged Pull Requests -- Fix regression where message isn't an identity property in log resource [#6779](https://github.com/chef/chef/pull/6779) ([tas50](https://github.com/tas50)) +- update immutable API blacklist and whitelist [#6778](https://github.com/chef/chef/pull/6778) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.7.16 --> ### Changes since 13.7.16 release #### Merged Pull Requests +- update immutable API blacklist and whitelist [#6778](https://github.com/chef/chef/pull/6778) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.25 --> - Fix regression where message isn't an identity property in log resource [#6779](https://github.com/chef/chef/pull/6779) ([tas50](https://github.com/tas50)) <!-- 14.0.24 --> - speed up http func tests [#6775](https://github.com/chef/chef/pull/6775) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.23 --> - Revert "Fail on interval runs on windows" [#6776](https://github.com/chef/chef/pull/6776) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.22 --> diff --git a/Gemfile.lock b/Gemfile.lock index ac53c03286..d793f5ad35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,10 +35,10 @@ GIT PATH remote: . specs: - chef (14.0.24) + chef (14.0.25) addressable bundler (>= 1.10) - chef-config (= 14.0.24) + chef-config (= 14.0.25) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -65,10 +65,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.0.24-universal-mingw32) + chef (14.0.25-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.0.24) + chef-config (= 14.0.25) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -110,7 +110,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.0.24) + chef-config (14.0.25) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -14.0.24
\ No newline at end of file +14.0.25
\ 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 552e3c33da..4256d9d7aa 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.24" + VERSION = "14.0.25" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 92a51b9b82..571527f785 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.24") + VERSION = Chef::VersionString.new("14.0.25") end # |