summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-08-08 19:08:07 +0000
committerChef Expeditor <chef-ci@chef.io>2019-08-08 19:08:07 +0000
commitf8a7f68d050d630d929e2e7049a21344b301a251 (patch)
tree8790e48b7a0da7ca8f2bf70fbe97bb25533aa8b6
parent99f5400e0038e8e841149dd59f147928af5124a0 (diff)
downloadohai-f8a7f68d050d630d929e2e7049a21344b301a251.tar.gz
Bump version to 15.2.5 by Chef Expeditorv15.2.5
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 cbb24f51..aa486b35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.2.4 -->
-## [v15.2.4](https://github.com/chef/ohai/tree/v15.2.4) (2019-08-03)
+<!-- latest_release 15.2.5 -->
+## [v15.2.5](https://github.com/chef/ohai/tree/v15.2.5) (2019-08-08)
#### Merged Pull Requests
-- Simplify the Openstack plugin by not polling DMI data [#1394](https://github.com/chef/ohai/pull/1394) ([tas50](https://github.com/tas50))
+- Fix platform_version detection on Fedora rawhide [#1396](https://github.com/chef/ohai/pull/1396) ([ritzk](https://github.com/ritzk))
<!-- latest_release -->
<!-- release_rollup since=15.1.5 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Fix platform_version detection on Fedora rawhide [#1396](https://github.com/chef/ohai/pull/1396) ([ritzk](https://github.com/ritzk)) <!-- 15.2.5 -->
- Simplify the Openstack plugin by not polling DMI data [#1394](https://github.com/chef/ohai/pull/1394) ([tas50](https://github.com/tas50)) <!-- 15.2.4 -->
- Use virtualization plugin to detect if we&#39;re on openstack on Windows. [#1391](https://github.com/chef/ohai/pull/1391) ([jjustice6](https://github.com/jjustice6)) <!-- 15.2.3 -->
- 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 -->
diff --git a/VERSION b/VERSION
index 5fb2f3ec..fc9e5cdc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.4 \ No newline at end of file
+15.2.5 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 2cca4026..15d31576 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.4".freeze
+ VERSION = "15.2.5".freeze
end