summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-08-15 18:39:49 +0000
committerChef Expeditor <chef-ci@chef.io>2019-08-15 18:39:49 +0000
commit038fd847c6d75dfaf6e60b67de185732aa245cc3 (patch)
treef131e46c6ba002fbfae68a970eb990adb9ae2040
parent66f0aec9a605a280c81701f6674e5195d4648a1b (diff)
downloadohai-038fd847c6d75dfaf6e60b67de185732aa245cc3.tar.gz
Bump version to 15.2.6 by Chef Expeditorv15.2.6
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md12
-rw-r--r--VERSION2
-rw-r--r--lib/ohai/version.rb2
3 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae3afeda..47a56329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
# Change Log
-<!-- latest_release -->
+<!-- latest_release 15.2.6 -->
+## [v15.2.6](https://github.com/chef/ohai/tree/v15.2.6) (2019-08-15)
+
+#### Merged Pull Requests
+- Use Benchmark.realtime for the main application time as well [#1397](https://github.com/chef/ohai/pull/1397) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=15.2.5 -->
+### Changes not yet released to rubygems.org
+
+#### Merged Pull Requests
+- Use Benchmark.realtime for the main application time as well [#1397](https://github.com/chef/ohai/pull/1397) ([tas50](https://github.com/tas50)) <!-- 15.2.6 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/VERSION b/VERSION
index fc9e5cdc..c9389ed3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.2.5 \ No newline at end of file
+15.2.6 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 15d31576..3666a0aa 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.5".freeze
+ VERSION = "15.2.6".freeze
end