summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-19 18:17:10 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-19 18:17:10 +0000
commit021082f727e07cbf8e2cf30be276135ddbb067c0 (patch)
tree8abda83855d00483ea3f10921ab39314368e88dd
parent8e7bdf9443533089e311c6abecd2f005b19e5df1 (diff)
downloadohai-021082f727e07cbf8e2cf30be276135ddbb067c0.tar.gz
Bump version to 14.8.14 by Chef Expeditorv14.8.14
Obvious fix; these changes are the result of automation not creative thinking.
-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 f4b02092..4f7da5ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.8.13 -->
-## [v14.8.13](https://github.com/chef/ohai/tree/v14.8.13) (2019-06-12)
+<!-- latest_release 14.8.14 -->
+## [v14.8.14](https://github.com/chef/ohai/tree/v14.8.14) (2019-07-19)
#### Merged Pull Requests
-- Define CONVERSION_STATUS only if it wasn&#39;t defined earlier [#1375](https://github.com/chef/ohai/pull/1375) ([balasankarc](https://github.com/balasankarc))
+- Backport the fix for multiple versions of a package being installed. [#1386](https://github.com/chef/ohai/pull/1386) ([jjustice6](https://github.com/jjustice6))
<!-- latest_release -->
<!-- release_rollup since=15.0.35 -->
### Changes not yet released to rubygems.orgs
#### Merged Pull Requests
+- Backport the fix for multiple versions of a package being installed. [#1386](https://github.com/chef/ohai/pull/1386) ([jjustice6](https://github.com/jjustice6)) <!-- 14.8.14 -->
- Define CONVERSION_STATUS only if it wasn&#39;t defined earlier [#1375](https://github.com/chef/ohai/pull/1375) ([balasankarc](https://github.com/balasankarc)) <!-- 14.8.13 -->
<!-- release_rollup -->
diff --git a/VERSION b/VERSION
index 371252f8..cb8aa65e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.8.13 \ No newline at end of file
+14.8.14 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 8bf3f3a0..0ea06e95 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.8.13".freeze
+ VERSION = "14.8.14".freeze
end