summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-06 17:24:47 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-06 17:24:47 +0000
commit3627eb769d3dd25098cf0cb34a4090c2e2e0b0df (patch)
tree05cb51cd8dbe7569a02b9b5637a22a20434933ae
parent94426d82203d94a7d820d365b22f20749d284a0c (diff)
downloadohai-3627eb769d3dd25098cf0cb34a4090c2e2e0b0df.tar.gz
Bump version to 14.0.22 by Expeditorv14.0.22
-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 55614506..f58e801b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.21 -->
-## [v14.0.21](https://github.com/chef/ohai/tree/v14.0.21) (2018-03-02)
+<!-- latest_release 14.0.22 -->
+## [v14.0.22](https://github.com/chef/ohai/tree/v14.0.22) (2018-03-06)
#### Merged Pull Requests
-- Remove support for Windows 2003 from uptime/cpu plugins [#1148](https://github.com/chef/ohai/pull/1148) ([tas50](https://github.com/tas50))
+- SUSE: Use /etc/os-release if present for all platform attributes [#1140](https://github.com/chef/ohai/pull/1140) ([yeoldegrove](https://github.com/yeoldegrove))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### Merged Pull Requests
+- SUSE: Use /etc/os-release if present for all platform attributes [#1140](https://github.com/chef/ohai/pull/1140) ([yeoldegrove](https://github.com/yeoldegrove)) <!-- 14.0.22 -->
- Remove support for Windows 2003 from uptime/cpu plugins [#1148](https://github.com/chef/ohai/pull/1148) ([tas50](https://github.com/tas50)) <!-- 14.0.21 -->
- Softlayer is forcing tlsv1_2 for all API calls [#1149](https://github.com/chef/ohai/pull/1149) ([smcavallo](https://github.com/smcavallo)) <!-- 14.0.20 -->
- Expand what we blacklist from the kernel/network plugins on Windows [#1147](https://github.com/chef/ohai/pull/1147) ([tas50](https://github.com/tas50)) <!-- 14.0.19 -->
diff --git a/VERSION b/VERSION
index 3b5572a3..48b1e019 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.21 \ No newline at end of file
+14.0.22 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index b304bf16..006d14cc 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.21"
+ VERSION = "14.0.22"
end