summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 921746e7..ee22710a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.19 -->
-## [v14.0.19](https://github.com/chef/ohai/tree/v14.0.19) (2018-02-28)
+<!-- latest_release 14.0.20 -->
+## [v14.0.20](https://github.com/chef/ohai/tree/v14.0.20) (2018-03-01)
#### Merged Pull Requests
-- Expand what we blacklist from the kernel/network plugins on Windows [#1147](https://github.com/chef/ohai/pull/1147) ([tas50](https://github.com/tas50))
+- Softlayer is forcing tlsv1_2 for all API calls [#1149](https://github.com/chef/ohai/pull/1149) ([smcavallo](https://github.com/smcavallo))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### Merged Pull Requests
+- 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 -->
- Mark the shard plugin as optional [#1146](https://github.com/chef/ohai/pull/1146) ([thommay](https://github.com/thommay)) <!-- 14.0.18 -->
- Add additional information to the kernel plugin on Windows [#1142](https://github.com/chef/ohai/pull/1142) ([tas50](https://github.com/tas50)) <!-- 14.0.17 -->
diff --git a/VERSION b/VERSION
index 6b9febc8..4d9d1891 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.19 \ No newline at end of file
+14.0.20 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 1c06fefd..210d583a 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.19"
+ VERSION = "14.0.20"
end