summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-09 17:53:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-09 17:53:03 +0000
commitdf58c0ea31653c9ca601ce4154fc964946b27455 (patch)
tree0cf71c8a412499e7fbb7485f7b53bc32940019d1
parenta31a6144f87149ca27f72588a4c0e44c0b4d2bf8 (diff)
downloadohai-df58c0ea31653c9ca601ce4154fc964946b27455.tar.gz
Bump version to 14.0.25 by Expeditorv14.0.25
-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 22cb297d..d975ea65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.24 -->
-## [v14.0.24](https://github.com/chef/ohai/tree/v14.0.24) (2018-03-09)
+<!-- latest_release 14.0.25 -->
+## [v14.0.25](https://github.com/chef/ohai/tree/v14.0.25) (2018-03-09)
#### Merged Pull Requests
-- add ohai support for softlayer cloud [#1155](https://github.com/chef/ohai/pull/1155) ([smcavallo](https://github.com/smcavallo))
+- Fix bug in azure plugin/update to recent metadata version. [#1154](https://github.com/chef/ohai/pull/1154) ([kriszentner](https://github.com/kriszentner))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### 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)) <!-- 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 -->
- SUSE: Use /etc/os-release if present for all platform attributes [#1140](https://github.com/chef/ohai/pull/1140) ([yeoldegrove](https://github.com/yeoldegrove)) <!-- 14.0.22 -->
diff --git a/VERSION b/VERSION
index da84cd5f..b97bac4a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.24 \ No newline at end of file
+14.0.25 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 9cc578c5..54d6d39d 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.24"
+ VERSION = "14.0.25"
end