summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-05 19:46:33 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-05 19:46:33 +0000
commitdbbd71fd79de6f03492e69936467412c43463a4e (patch)
tree23d54b74f390a8b07d88f6b1490497918555c5ad
parent31c3c7483d42957bdb302c96b2d65588b6008804 (diff)
downloadohai-dbbd71fd79de6f03492e69936467412c43463a4e.tar.gz
Bump version to 15.0.25 by Chef Expeditorv15.0.25
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 1a76da90..a1493097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.0.24 -->
-## [v15.0.24](https://github.com/chef/ohai/tree/v15.0.24) (2018-12-05)
+<!-- latest_release 15.0.25 -->
+## [v15.0.25](https://github.com/chef/ohai/tree/v15.0.25) (2018-12-05)
#### Merged Pull Requests
-- Unify virtualization detection on a single helper [#1317](https://github.com/chef/ohai/pull/1317) ([tas50](https://github.com/tas50))
+- Add support for XCP-ng platform [#1283](https://github.com/chef/ohai/pull/1283) ([heyjodom](https://github.com/heyjodom))
<!-- latest_release -->
<!-- release_rollup since=14.6.2 -->
### Changes since 14.6.2 release
#### Merged Pull Requests
+- Add support for XCP-ng platform [#1283](https://github.com/chef/ohai/pull/1283) ([heyjodom](https://github.com/heyjodom)) <!-- 15.0.25 -->
- Unify virtualization detection on a single helper [#1317](https://github.com/chef/ohai/pull/1317) ([tas50](https://github.com/tas50)) <!-- 15.0.24 -->
- Require Ruby 2.5 or later [#1300](https://github.com/chef/ohai/pull/1300) ([tas50](https://github.com/tas50)) <!-- 15.0.23 -->
- Back out SLES -&gt; SUSE remapping and instead fix the platform_family [#1322](https://github.com/chef/ohai/pull/1322) ([tas50](https://github.com/tas50)) <!-- 15.0.22 -->
diff --git a/VERSION b/VERSION
index a31d7e2b..e6402183 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.24 \ No newline at end of file
+15.0.25 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index aa035ca9..c369ee05 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.0.24".freeze
+ VERSION = "15.0.25".freeze
end