diff --git a/CHANGELOG.md b/CHANGELOG.md index 566dc352c..36a1257cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,17 @@ # Change Log - -## [15.2.1](https://github.com/chef/ohai/tree/15.2.1) (2019-07-19) + +## [15.2.2](https://github.com/chef/ohai/tree/15.2.2) (2019-08-01) #### Merged Pull Requests -- Translating platform "archarm" to "arch" [#1388](https://github.com/chef/ohai/pull/1388) ([BackSlasher](https://github.com/BackSlasher)) +- Display elapsed real time instead of total cpu time [#1392](https://github.com/chef/ohai/pull/1392) ([teknofire](https://github.com/teknofire)) ### Changes not yet released to rubygems.org #### Merged Pull Requests +- Display elapsed real time instead of total cpu time [#1392](https://github.com/chef/ohai/pull/1392) ([teknofire](https://github.com/teknofire)) - Translating platform "archarm" to "arch" [#1388](https://github.com/chef/ohai/pull/1388) ([BackSlasher](https://github.com/BackSlasher)) - Add other_versions subfield for RPM packages. [#1369](https://github.com/chef/ohai/pull/1369) ([jjustice6](https://github.com/jjustice6)) - Switch from Appveyor to Buildkite for Windows PR testing [#1383](https://github.com/chef/ohai/pull/1383) ([tas50](https://github.com/tas50)) diff --git a/VERSION b/VERSION index 0c9d1ec65..ee7380d66 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.2.1 \ No newline at end of file +15.2.2 \ No newline at end of file diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index bfc80641d..bf701ff80 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -18,5 +18,5 @@ module Ohai OHAI_ROOT = File.expand_path(File.dirname(__FILE__)) - VERSION = "15.2.1".freeze + VERSION = "15.2.2".freeze end