summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-11-28 18:17:27 +0000
committerChef Expeditor <chef-ci@chef.io>2018-11-28 18:17:27 +0000
commit124f5d2f0a5f97ae430f3f782a79577b4020675d (patch)
treecca21f145cfd0f3e33971aa0654a53a2af9d6ba8
parent6cd31b3d820293878f4e6e6cb47d4d3b4bb65d94 (diff)
downloadohai-124f5d2f0a5f97ae430f3f782a79577b4020675d.tar.gz
Bump version to 15.0.13 by Chef Expeditorv15.0.13
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 9febf8cc..69b82402 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.0.12 -->
-## [v15.0.12](https://github.com/chef/ohai/tree/v15.0.12) (2018-11-27)
+<!-- latest_release 15.0.13 -->
+## [v15.0.13](https://github.com/chef/ohai/tree/v15.0.13) (2018-11-28)
#### Merged Pull Requests
-- /etc/os-release based OS detection [#1299](https://github.com/chef/ohai/pull/1299) ([tas50](https://github.com/tas50))
+- 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))
<!-- latest_release -->
<!-- release_rollup since=14.6.2 -->
### Changes since 14.6.2 release
#### Merged Pull Requests
+- 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 -->
- Correctly detect openSUSE leap 15+ [#1297](https://github.com/chef/ohai/pull/1297) ([tas50](https://github.com/tas50)) <!-- 15.0.11 -->
- Remove circa ~2005 virtualization hypervisor detection [#1305](https://github.com/chef/ohai/pull/1305) ([tas50](https://github.com/tas50)) <!-- 15.0.10 -->
diff --git a/VERSION b/VERSION
index 55b22c6b..620a1642 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.12 \ No newline at end of file
+15.0.13 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index b69c4f40..b26c2a91 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.12".freeze
+ VERSION = "15.0.13".freeze
end