summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-16 09:52:38 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-16 09:52:38 +0000
commit8ff528642bd8f9d23d6d9e0a7fb96f6a5cd8afc8 (patch)
tree9d7387acbf4a96745a3ed90f9b5337f6ed5abee9
parent8941b3ab8d7cc7d759e3dba264b398dd04559f31 (diff)
downloadohai-8ff528642bd8f9d23d6d9e0a7fb96f6a5cd8afc8.tar.gz
Bump version to 14.0.4 by Expeditorv14.0.4
-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 15fc71d6..44bcf41c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.3 -->
-## [v14.0.3](https://github.com/chef/ohai/tree/v14.0.3) (2018-02-16)
+<!-- latest_release 14.0.4 -->
+## [v14.0.4](https://github.com/chef/ohai/tree/v14.0.4) (2018-02-16)
#### Merged Pull Requests
-- Simplify path logic by requiring chef-config 12.8+ [#1128](https://github.com/chef/ohai/pull/1128) ([tas50](https://github.com/tas50))
+- account for snap based installations of LXD [#1131](https://github.com/chef/ohai/pull/1131) ([thewyzard44](https://github.com/thewyzard44))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### Merged Pull Requests
+- account for snap based installations of LXD [#1131](https://github.com/chef/ohai/pull/1131) ([thewyzard44](https://github.com/thewyzard44)) <!-- 14.0.4 -->
- Simplify path logic by requiring chef-config 12.8+ [#1128](https://github.com/chef/ohai/pull/1128) ([tas50](https://github.com/tas50)) <!-- 14.0.3 -->
- adds whitespace stripping for the shellout stdout [#1132](https://github.com/chef/ohai/pull/1132) ([rmcleod8](https://github.com/rmcleod8)) <!-- 14.0.2 -->
<!-- release_rollup -->
diff --git a/VERSION b/VERSION
index 3b0c3fb7..25f846fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.3 \ No newline at end of file
+14.0.4 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 1fc3a8f2..67363819 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.3"
+ VERSION = "14.0.4"
end