summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-08-01 00:27:51 +0000
committerChef Expeditor <chef-ci@chef.io>2019-08-01 00:27:51 +0000
commitb0cc3c199af96d28c9f560bcf0b640a49dff6fbc (patch)
tree18e70b3a35009108a205424302fc17543d7492e5
parentdb1782b61ca54c44ef687647f8f205e284229df7 (diff)
downloadohai-15.2.2.tar.gz
Bump version to 15.2.2 by Chef Expeditor15.2.2
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--VERSION2
-rw-r--r--lib/ohai/version.rb2
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 566dc352..36a1257c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.2.1 -->
-## [15.2.1](https://github.com/chef/ohai/tree/15.2.1) (2019-07-19)
+<!-- latest_release 15.2.2 -->
+## [15.2.2](https://github.com/chef/ohai/tree/15.2.2) (2019-08-01)
#### Merged Pull Requests
-- Translating platform &quot;archarm&quot; to &quot;arch&quot; [#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))
<!-- latest_release -->
<!-- release_rollup since=15.1.5 -->
### 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)) <!-- 15.2.2 -->
- Translating platform &quot;archarm&quot; to &quot;arch&quot; [#1388](https://github.com/chef/ohai/pull/1388) ([BackSlasher](https://github.com/BackSlasher)) <!-- 15.2.1 -->
- Add other_versions subfield for RPM packages. [#1369](https://github.com/chef/ohai/pull/1369) ([jjustice6](https://github.com/jjustice6)) <!-- 15.2.0 -->
- Switch from Appveyor to Buildkite for Windows PR testing [#1383](https://github.com/chef/ohai/pull/1383) ([tas50](https://github.com/tas50)) <!-- 15.1.8 -->
diff --git a/VERSION b/VERSION
index 0c9d1ec6..ee7380d6 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 bfc80641..bf701ff8 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