summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-06-13 23:03:02 +0000
committerChef Expeditor <chef-ci@chef.io>2019-06-13 23:03:02 +0000
commitd1a25fa525a4760609642d244cc729a46aa194ce (patch)
tree2f8bc716429bd050237080ddc16d547b945bac04
parent9b9fdd4914fa3694ae6c4f96311f43e64befd0f7 (diff)
downloadohai-d1a25fa525a4760609642d244cc729a46aa194ce.tar.gz
Bump version to 15.1.3 by Chef Expeditorv15.1.315.1.3
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 36f8068e..e1470f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 15.1.2 -->
-## [15.1.2](https://github.com/chef/ohai/tree/15.1.2) (2019-06-13)
+<!-- latest_release 15.1.3 -->
+## [15.1.3](https://github.com/chef/ohai/tree/15.1.3) (2019-06-13)
#### Merged Pull Requests
-- Simplify how we create empty mashes in the plugins [#1374](https://github.com/chef/ohai/pull/1374) ([tas50](https://github.com/tas50))
+- Merge the new vbox plugin into the existing virtualbox plugin [#1376](https://github.com/chef/ohai/pull/1376) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.0.35 -->
### Changes not yet released to rubygems.orgs
#### Merged Pull Requests
+- Merge the new vbox plugin into the existing virtualbox plugin [#1376](https://github.com/chef/ohai/pull/1376) ([tas50](https://github.com/tas50)) <!-- 15.1.3 -->
- Simplify how we create empty mashes in the plugins [#1374](https://github.com/chef/ohai/pull/1374) ([tas50](https://github.com/tas50)) <!-- 15.1.2 -->
- Use virtualization attributes to run or skip the virtualbox plugin [#1373](https://github.com/chef/ohai/pull/1373) ([tas50](https://github.com/tas50)) <!-- 15.1.1 -->
- Test on ruby 2.6 in Appveyor and remove the travis config [#1372](https://github.com/chef/ohai/pull/1372) ([tas50](https://github.com/tas50)) <!-- 15.1.0 -->
diff --git a/VERSION b/VERSION
index 62acbb5e..a9e11086 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.2 \ No newline at end of file
+15.1.3 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 378b5ddb..d51da2b2 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.1.2".freeze
+ VERSION = "15.1.3".freeze
end