summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2018-10-10 19:42:03 +0000
committerChef Expeditor <chef-ci@chef.io>2018-10-10 19:42:03 +0000
commitb6961402ee8f42114972e38ea5a23fcc362646ee (patch)
tree67c7917969c0f5e93475b5b95083f65a71c35f86
parent68b30557bcdecc496bcca2a8d99a87da1ab159be (diff)
downloadohai-b6961402ee8f42114972e38ea5a23fcc362646ee.tar.gz
Bump version to 14.6.1 by Chef Expeditorv14.6.1
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 357b3bc7..430be2cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.6.0 -->
-## [v14.6.0](https://github.com/chef/ohai/tree/v14.6.0) (2018-10-10)
+<!-- latest_release 14.6.1 -->
+## [v14.6.1](https://github.com/chef/ohai/tree/v14.6.1) (2018-10-10)
#### Merged Pull Requests
-- [filesystem] Convert rest of unix to fs2 [#1266](https://github.com/chef/ohai/pull/1266) ([jaymzh](https://github.com/jaymzh))
+- Correctly detect SLES 15 systems as &quot;suse&quot; platform [#1272](https://github.com/chef/ohai/pull/1272) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.5.4 -->
### Changes since 14.5.4 release
#### Merged Pull Requests
+- Correctly detect SLES 15 systems as &quot;suse&quot; platform [#1272](https://github.com/chef/ohai/pull/1272) ([tas50](https://github.com/tas50)) <!-- 14.6.1 -->
- [filesystem] Convert rest of unix to fs2 [#1266](https://github.com/chef/ohai/pull/1266) ([jaymzh](https://github.com/jaymzh)) <!-- 14.6.0 -->
- Trim out bogus data in system_profile plugin [#1263](https://github.com/chef/ohai/pull/1263) ([tas50](https://github.com/tas50)) <!-- 14.5.10 -->
- Unify the cpu plugin [#1262](https://github.com/chef/ohai/pull/1262) ([jaymzh](https://github.com/jaymzh)) <!-- 14.5.9 -->
diff --git a/VERSION b/VERSION
index 91462bc9..9b87fcc4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.6.0 \ No newline at end of file
+14.6.1 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index db54032b..73fcde74 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.6.0".freeze
+ VERSION = "14.6.1".freeze
end