diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-23 23:42:30 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-23 23:42:30 +0000 |
| commit | 6827f8d4957a76a29930b9f4bcb56715c923321a (patch) | |
| tree | b0c6292d21811cf2364a842e01d405120fdbfd81 | |
| parent | d15a04481d4fabe87adebe5757b845c5e286ea1f (diff) | |
| download | chef-6827f8d4957a76a29930b9f4bcb56715c923321a.tar.gz | |
Bump version to 12.21.25 by Expeditorv12.21.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 cf6c286058..8006272592 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 12.21.24 --> -## [v12.21.24](https://github.com/chef/chef/tree/v12.21.24) (2017-10-19) +<!-- latest_release 12.21.25 --> +## [v12.21.25](https://github.com/chef/chef/tree/v12.21.25) (2017-10-23) #### Merged Pull Requests -- Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) +- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- Update ruby version required in readme [#6517](https://github.com/chef/chef/pull/6517) ([tas50](https://github.com/tas50)) <!-- 12.21.25 --> - Pull in Ohai 8.25 [#6509](https://github.com/chef/chef/pull/6509) ([tas50](https://github.com/tas50)) <!-- 12.21.24 --> - Use Rubygems 2.6.14 to fix CVE-2017-0903 [#6507](https://github.com/chef/chef/pull/6507) ([tas50](https://github.com/tas50)) <!-- 12.21.23 --> - Pull in Ohai 8.24.1 [#6506](https://github.com/chef/chef/pull/6506) ([tas50](https://github.com/tas50)) <!-- 12.21.22 --> diff --git a/Gemfile.lock b/Gemfile.lock index 3ca5fdd3e4..fb2bde1ac5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,10 +38,10 @@ GIT PATH remote: . specs: - chef (12.21.24) + chef (12.21.25) addressable bundler (>= 1.10) - chef-config (= 12.21.24) + chef-config (= 12.21.25) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -67,10 +67,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (12.21.24-universal-mingw32) + chef (12.21.25-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 12.21.24) + chef-config (= 12.21.25) chef-zero (>= 4.8, < 13) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -111,7 +111,7 @@ PATH PATH remote: chef-config specs: - chef-config (12.21.24) + chef-config (12.21.25) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -12.21.24
\ No newline at end of file +12.21.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 0d82a89d9d..e6b8e2f883 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 = "12.21.24" + VERSION = "12.21.25" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 05031d49c6..a744b8a092 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "12.21.24" + VERSION = "12.21.25" end # |