summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-12-03 21:15:05 +0000
committerChef Expeditor <chef-ci@chef.io>2018-12-03 21:15:05 +0000
commitac1b1ddbe302efc690486ee946f09657d201b93e (patch)
tree541e344abf4ee6b87238b8d33b400da74bc81803
parent2951350d54bf59da2fe92203ee1db7370f39c60d (diff)
downloadohai-ac1b1ddbe302efc690486ee946f09657d201b93e.tar.gz
Bump version to 15.0.15 by Chef Expeditorv15.0.15
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 8b928470..e9dd4961 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.0.14 -->
-## [v15.0.14](https://github.com/chef/ohai/tree/v15.0.14) (2018-11-30)
+<!-- latest_release 15.0.15 -->
+## [v15.0.15](https://github.com/chef/ohai/tree/v15.0.15) (2018-12-03)
#### Merged Pull Requests
-- Linux Virtualization: Use the new nests `systems` format for lxd / lxc [#1309](https://github.com/chef/ohai/pull/1309) ([tas50](https://github.com/tas50))
+- Add mangeia platform with madriva platform_family [#1316](https://github.com/chef/ohai/pull/1316) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.6.2 -->
### Changes since 14.6.2 release
#### Merged Pull Requests
+- Add mangeia platform with madriva platform_family [#1316](https://github.com/chef/ohai/pull/1316) ([tas50](https://github.com/tas50)) <!-- 15.0.15 -->
- Linux Virtualization: Use the new nests `systems` format for lxd / lxc [#1309](https://github.com/chef/ohai/pull/1309) ([tas50](https://github.com/tas50)) <!-- 15.0.14 -->
- Windows: Fix for fqdn is being set as the machine name instead of fqdn [#1310](https://github.com/chef/ohai/pull/1310) ([vijaymmali1990](https://github.com/vijaymmali1990)) <!-- 15.0.13 -->
- /etc/os-release based OS detection [#1299](https://github.com/chef/ohai/pull/1299) ([tas50](https://github.com/tas50)) <!-- 15.0.12 -->
diff --git a/VERSION b/VERSION
index f1d170d2..90c9640b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.14 \ No newline at end of file
+15.0.15 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index e3d36d95..e80a5488 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.14".freeze
+ VERSION = "15.0.15".freeze
end