summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-03 15:37:19 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-03 15:37:19 +0000
commitf778ab34c3af364855dac3c9185c6325639682da (patch)
treead19283e5f97139ad15f847a5fef87e22796570b
parent8227540c5b95436abb9423b79e6a5f6645144be9 (diff)
downloadohai-f778ab34c3af364855dac3c9185c6325639682da.tar.gz
Bump version to 14.0.34 by Chef Expeditorv14.0.34
-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 58c4b44e..e255449e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 14.0.33 -->
-## [v14.0.33](https://github.com/chef/ohai/tree/v14.0.33) (2018-05-03)
+<!-- latest_release 14.0.34 -->
+## [v14.0.34](https://github.com/chef/ohai/tree/v14.0.34) (2018-05-03)
#### Merged Pull Requests
-- Make the shard plugin work under FIPS by using SHA2 instead of MD5 [#1175](https://github.com/chef/ohai/pull/1175) ([coderanger](https://github.com/coderanger))
+- Make the DMI IDs we whitelist configurable [#970](https://github.com/chef/ohai/pull/970) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.0.28 -->
### Changes since 14.0.28 release
#### Merged Pull Requests
+- Make the DMI IDs we whitelist configurable [#970](https://github.com/chef/ohai/pull/970) ([tas50](https://github.com/tas50)) <!-- 14.0.34 -->
- Make the shard plugin work under FIPS by using SHA2 instead of MD5 [#1175](https://github.com/chef/ohai/pull/1175) ([coderanger](https://github.com/coderanger)) <!-- 14.0.33 -->
- Make the FIPS plugins use the new Ruby 2.5 accessor if present [#1178](https://github.com/chef/ohai/pull/1178) ([coderanger](https://github.com/coderanger)) <!-- 14.0.32 -->
- SCSI plugin [#1170](https://github.com/chef/ohai/pull/1170) ([jaymzh](https://github.com/jaymzh)) <!-- 14.0.31 -->
diff --git a/VERSION b/VERSION
index 7790940a..becaa8c0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.33 \ No newline at end of file
+14.0.34 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 38210160..ac64bcbc 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.33"
+ VERSION = "14.0.34"
end