summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-02 18:20:07 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-03-02 18:20:07 +0000
commit159c9046b14e86969d1e2373c4e28cb67ef3bc08 (patch)
treec9ce54edc8d2c049bd88a1738bf0442b57872490
parenta588f55f633e0d92841018518b5af7c730f7cf28 (diff)
downloadohai-159c9046b14e86969d1e2373c4e28cb67ef3bc08.tar.gz
Bump version to 14.0.21 by Expeditorv14.0.21
-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 ee22710a..55614506 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.20 -->
-## [v14.0.20](https://github.com/chef/ohai/tree/v14.0.20) (2018-03-01)
+<!-- latest_release 14.0.21 -->
+## [v14.0.21](https://github.com/chef/ohai/tree/v14.0.21) (2018-03-02)
#### 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))
+- Remove support for Windows 2003 from uptime/cpu plugins [#1148](https://github.com/chef/ohai/pull/1148) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.7.1 -->
### Changes since 13.7.1 release
#### 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)) <!-- 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 -->
- Mark the shard plugin as optional [#1146](https://github.com/chef/ohai/pull/1146) ([thommay](https://github.com/thommay)) <!-- 14.0.18 -->
diff --git a/VERSION b/VERSION
index 4d9d1891..3b5572a3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.20 \ No newline at end of file
+14.0.21 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 210d583a..b304bf16 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.20"
+ VERSION = "14.0.21"
end