diff options
| author | Tim Smith <tsmith@chef.io> | 2022-01-06 16:23:57 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 16:23:57 -0800 |
| commit | dbbdb42a33232688c84391d722bf48722b6de8c7 (patch) | |
| tree | 87e65c9cb5b79a687350bd8c289424249d9172d6 | |
| parent | b767b271d423cc883ee56272866eb36ed405d079 (diff) | |
| parent | bddccd3bb3b3ce79c48ee9a05d1bb4488938bfc5 (diff) | |
| download | ohai-dbbdb42a33232688c84391d722bf48722b6de8c7.tar.gz | |
Merge branch 'main' into 18_release
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b41b995..71bf86ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,18 @@ # Change Log -<!-- latest_release --> +<!-- latest_release 17.9.2 --> +## [v17.9.2](https://github.com/chef/ohai/tree/v17.9.2) (2022-01-06) + +#### Merged Pull Requests +- Update chefstyle requirement from 2.1.3 to 2.2.0 [#1725](https://github.com/chef/ohai/pull/1725) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=17.9.0 --> +### Changes not yet released to rubygems.org + +#### Merged Pull Requests +- Update chefstyle requirement from 2.1.3 to 2.2.0 [#1725](https://github.com/chef/ohai/pull/1725) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.9.2 --> +- Update rubocop-performance requirement from 1.12.0 to 1.13.0 [#1723](https://github.com/chef/ohai/pull/1723) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 17.9.1 --> <!-- release_rollup --> <!-- latest_stable_release --> @@ -9,14 +9,14 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local group :development do - gem "chefstyle", "2.1.3" + gem "chefstyle", "2.2.0" gem "ipaddr_extensions" gem "rake", ">= 10.1.0" gem "rspec-collection_matchers", "~> 1.0" gem "rspec-core", "~> 3.0" gem "rspec-expectations", "~> 3.0" gem "rspec-mocks", "~> 3.0" - gem "rubocop-performance", "1.12.0" + gem "rubocop-performance", "1.13.0" gem "rubocop-rspec" end @@ -1 +1 @@ -18.0.0
\ No newline at end of file +18.0.0 diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index 583f586e..d9e088a7 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -19,5 +19,5 @@ module Ohai OHAI_ROOT = File.expand_path(__dir__) - VERSION = "17.9.0" + VERSION = "17.9.2" end |