diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-03-20 03:40:36 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-03-20 03:40:36 +0000 |
commit | b40baa44b03337a91b5ff5c74c636d77b872e672 (patch) | |
tree | 78c2828a04b6bc69f51be436269e8d5af4eed7d3 | |
parent | 82a108dd253834dd0e210af7b55e5b8a85718e48 (diff) | |
download | chef-b40baa44b03337a91b5ff5c74c636d77b872e672.tar.gz |
Bump version to 14.11.25 by Chef Expeditorv14.11.25
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 c37e5118b9..45fd6f2d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.11.24 --> -## [v14.11.24](https://github.com/chef/chef/tree/v14.11.24) (2019-03-19) +<!-- latest_release 14.11.25 --> +## [v14.11.25](https://github.com/chef/chef/tree/v14.11.25) (2019-03-20) #### Merged Pull Requests -- Loosen the win32-cerstore and win32-service dependencies [#8295](https://github.com/chef/chef/pull/8295) ([tas50](https://github.com/tas50)) +- Remove travis gem dep and bump versions of multiple components [#8315](https://github.com/chef/chef/pull/8315) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.11.21 --> ### Changes since 14.11.21 release #### Merged Pull Requests +- Remove travis gem dep and bump versions of multiple components [#8315](https://github.com/chef/chef/pull/8315) ([tas50](https://github.com/tas50)) <!-- 14.11.25 --> - Loosen the win32-cerstore and win32-service dependencies [#8295](https://github.com/chef/chef/pull/8295) ([tas50](https://github.com/tas50)) <!-- 14.11.24 --> - Backport fix for #8080 [#8303](https://github.com/chef/chef/pull/8303) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.11.23 --> - windows_certificate: Import nested certificates while importing P7B certs [#8274](https://github.com/chef/chef/pull/8274) ([tas50](https://github.com/tas50)) <!-- 14.11.22 --> diff --git a/Gemfile.lock b/Gemfile.lock index 4e8baf3f07..aa32eefa16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.11.24) + chef (14.11.25) addressable bundler (>= 1.10) - chef-config (= 14.11.24) + chef-config (= 14.11.25) 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.11.24-universal-mingw32) + chef (14.11.25-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.11.24) + chef-config (= 14.11.25) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -78,7 +78,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.11.24) + chef-config (14.11.25) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.11.24
\ No newline at end of file +14.11.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 91ae04dc06..2d94dbd352 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.11.24".freeze + VERSION = "14.11.25".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index f59511037c..947600aaf4 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.11.24") + VERSION = Chef::VersionString.new("14.11.25") end # |