summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-27 13:23:48 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-27 13:23:48 +0000
commite3dfe501fc3d7193fc052bdbf336629f7a6d3f89 (patch)
tree5dc85396e6f571001e21086091c0a25a8f9a2ea8
parente5f74b4996a01c36212782accd336e4ddf512d3d (diff)
downloadohai-e3dfe501fc3d7193fc052bdbf336629f7a6d3f89.tar.gz
Bump version to 14.0.15 by Expeditorv14.0.15
-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 9757a4ca..7e179bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.14 -->
-## [v14.0.14](https://github.com/chef/ohai/tree/v14.0.14) (2018-02-26)
+<!-- latest_release 14.0.15 -->
+## [v14.0.15](https://github.com/chef/ohai/tree/v14.0.15) (2018-02-27)
#### Merged Pull Requests
-- Simplify &amp; optimize the kernel plugin [#1139](https://github.com/chef/ohai/pull/1139) ([tas50](https://github.com/tas50))
+- Add scaleway plugin [#1124](https://github.com/chef/ohai/pull/1124) ([josqu4red](https://github.com/josqu4red))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### Merged Pull Requests
+- Add scaleway plugin [#1124](https://github.com/chef/ohai/pull/1124) ([josqu4red](https://github.com/josqu4red)) <!-- 14.0.15 -->
- Simplify &amp; optimize the kernel plugin [#1139](https://github.com/chef/ohai/pull/1139) ([tas50](https://github.com/tas50)) <!-- 14.0.14 -->
- Support optional plugins [#1136](https://github.com/chef/ohai/pull/1136) ([thommay](https://github.com/thommay)) <!-- 14.0.13 -->
- fix critical plugin tests [#1135](https://github.com/chef/ohai/pull/1135) ([thommay](https://github.com/thommay)) <!-- 14.0.11 -->
diff --git a/VERSION b/VERSION
index ce078705..400dc384 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.14 \ No newline at end of file
+14.0.15 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index d387d762..17fff84b 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.14"
+ VERSION = "14.0.15"
end