diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 22 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f972fbb6ba..ba8a827265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 16.7.24 --> -## [v16.7.24](https://github.com/chef/chef/tree/v16.7.24) (2020-11-04) +<!-- latest_release 16.7.25 --> +## [v16.7.25](https://github.com/chef/chef/tree/v16.7.25) (2020-11-05) #### Merged Pull Requests -- Use tr where we don't need gsub and a regex [#10597](https://github.com/chef/chef/pull/10597) ([tas50](https://github.com/tas50)) +- Remove duplicate Gemfile gems + update ohai to 16.7.13 [#10602](https://github.com/chef/chef/pull/10602) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=16.6.14 --> ### Changes not yet released to stable #### Merged Pull Requests +- Remove duplicate Gemfile gems + update ohai to 16.7.13 [#10602](https://github.com/chef/chef/pull/10602) ([tas50](https://github.com/tas50)) <!-- 16.7.25 --> - Use tr where we don't need gsub and a regex [#10597](https://github.com/chef/chef/pull/10597) ([tas50](https://github.com/tas50)) <!-- 16.7.24 --> - Improve auto generated resource docs [#10596](https://github.com/chef/chef/pull/10596) ([tas50](https://github.com/tas50)) <!-- 16.7.23 --> - Namespace ResourceInspector to avoid conflicts with Inspec's [#10595](https://github.com/chef/chef/pull/10595) ([phiggins](https://github.com/phiggins)) <!-- 16.7.22 --> diff --git a/Gemfile.lock b/Gemfile.lock index 4996ca8353..6937b86cc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,12 +28,12 @@ GIT PATH remote: . specs: - chef (16.7.24) + chef (16.7.25) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.7.24) - chef-utils (= 16.7.24) + chef-config (= 16.7.25) + chef-utils (= 16.7.25) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -64,12 +64,12 @@ PATH tty-screen (~> 0.6) tty-table (~> 0.11) uuidtools (~> 2.1.5) - chef (16.7.24-universal-mingw32) + chef (16.7.25-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.7.24) - chef-utils (= 16.7.24) + chef-config (= 16.7.25) + chef-utils (= 16.7.25) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -115,15 +115,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (16.7.24) - chef (= 16.7.24) + chef-bin (16.7.25) + chef (= 16.7.25) PATH remote: chef-config specs: - chef-config (16.7.24) + chef-config (16.7.25) addressable - chef-utils (= 16.7.24) + chef-utils (= 16.7.25) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -132,7 +132,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (16.7.24) + chef-utils (16.7.25) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -16.7.24
\ No newline at end of file +16.7.25
\ No newline at end of file diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index 099753d911..b0d87d48c8 100644 --- a/chef-bin/lib/chef-bin/version.rb +++ b/chef-bin/lib/chef-bin/version.rb @@ -21,7 +21,7 @@ module ChefBin CHEFBIN_ROOT = File.expand_path("..", __dir__) - VERSION = "16.7.24".freeze + VERSION = "16.7.25".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f6d3b23263..500193115a 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -15,5 +15,5 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("..", __dir__) - VERSION = "16.7.24".freeze + VERSION = "16.7.25".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index e3099fe49b..82008b822c 100644 --- a/chef-utils/lib/chef-utils/version.rb +++ b/chef-utils/lib/chef-utils/version.rb @@ -16,5 +16,5 @@ module ChefUtils CHEFUTILS_ROOT = File.expand_path("..", __dir__) - VERSION = "16.7.24" + VERSION = "16.7.25" end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 0b535f699a..04973e0751 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require_relative "version_string" class Chef CHEF_ROOT = File.expand_path("..", __dir__) - VERSION = Chef::VersionString.new("16.7.24") + VERSION = Chef::VersionString.new("16.7.25") end # |