summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-15 11:06:16 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-15 11:06:16 +0000
commit65b2ee96ae77a7498b21663181b9c524e1235e26 (patch)
treef48b721a06065ad24582a245a7b308157bb50a42
parent8dda5308ac1701ce8c7831844455df70528ca37e (diff)
downloadohai-65b2ee96ae77a7498b21663181b9c524e1235e26.tar.gz
Bump version to 14.0.26 by Expeditorv14.0.26
-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 d975ea65..50e8a512 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.25 -->
-## [v14.0.25](https://github.com/chef/ohai/tree/v14.0.25) (2018-03-09)
+<!-- latest_release 14.0.26 -->
+## [v14.0.26](https://github.com/chef/ohai/tree/v14.0.26) (2018-03-15)
#### Merged Pull Requests
-- Fix bug in azure plugin/update to recent metadata version. [#1154](https://github.com/chef/ohai/pull/1154) ([kriszentner](https://github.com/kriszentner))
+- Minor updates to the Ohai/Chef plugins [#1160](https://github.com/chef/ohai/pull/1160) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### Merged Pull Requests
+- Minor updates to the Ohai/Chef plugins [#1160](https://github.com/chef/ohai/pull/1160) ([tas50](https://github.com/tas50)) <!-- 14.0.26 -->
- Fix bug in azure plugin/update to recent metadata version. [#1154](https://github.com/chef/ohai/pull/1154) ([kriszentner](https://github.com/kriszentner)) <!-- 14.0.25 -->
- add ohai support for softlayer cloud [#1155](https://github.com/chef/ohai/pull/1155) ([smcavallo](https://github.com/smcavallo)) <!-- 14.0.24 -->
- Fix chefstyle issues in ohai [#1153](https://github.com/chef/ohai/pull/1153) ([tas50](https://github.com/tas50)) <!-- 14.0.23 -->
diff --git a/VERSION b/VERSION
index b97bac4a..32667cd2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.25 \ No newline at end of file
+14.0.26 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 54d6d39d..ecd2f4ac 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 = "14.0.25"
+ VERSION = "14.0.26"
end