summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-19 17:13:48 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-19 17:13:48 +0000
commit909456260c5c66b87e763e4b01daf799db9c36d1 (patch)
tree19b31b9d4b17e2650dbb5d4af93da8cfe7240676
parentb8107ff31b086e7cedabfd4ec5b48db8a4411386 (diff)
downloadohai-909456260c5c66b87e763e4b01daf799db9c36d1.tar.gz
Bump version to 14.0.29 by Expeditorv14.0.29
-rw-r--r--CHANGELOG.md12
-rw-r--r--VERSION2
-rw-r--r--lib/ohai/version.rb2
3 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f28fddda..93c9f2e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
# Change Log
-<!-- latest_release -->
+<!-- latest_release 14.0.29 -->
+## [v14.0.29](https://github.com/chef/ohai/tree/v14.0.29) (2018-03-19)
+
+#### Merged Pull Requests
+- Don&#39;t stacktrace if we can&#39;t shell_out to zpool [#1141](https://github.com/chef/ohai/pull/1141) ([tas50](https://github.com/tas50))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.0.28 -->
+### Changes since 14.0.28 release
+
+#### Merged Pull Requests
+- Don&#39;t stacktrace if we can&#39;t shell_out to zpool [#1141](https://github.com/chef/ohai/pull/1141) ([tas50](https://github.com/tas50)) <!-- 14.0.29 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/VERSION b/VERSION
index c29675e5..f9680549 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.28 \ No newline at end of file
+14.0.29 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 565d87a2..2e65e238 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.28"
+ VERSION = "14.0.29"
end