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 9c503617..90a57a6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
# Change Log
-<!-- latest_release 17.0.3 -->
-## [v17.0.3](https://github.com/chef/ohai/tree/v17.0.3) (2020-12-23)
+<!-- latest_release 17.0.4 -->
+## [v17.0.4](https://github.com/chef/ohai/tree/v17.0.4) (2021-01-05)
#### Merged Pull Requests
-- Stop gathering filesystem2 data on BSD/Solaris/AIX [#1592](https://github.com/chef/ohai/pull/1592) ([tas50](https://github.com/tas50))
+- Fetch chef-utils and chef-config from chef-16 branch [#1594](https://github.com/chef/ohai/pull/1594) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.8.1 -->
### Changes not yet released to rubygems.org
#### Merged Pull Requests
+- Fetch chef-utils and chef-config from chef-16 branch [#1594](https://github.com/chef/ohai/pull/1594) ([tas50](https://github.com/tas50)) <!-- 17.0.4 -->
- Stop gathering filesystem2 data on BSD/Solaris/AIX [#1592](https://github.com/chef/ohai/pull/1592) ([tas50](https://github.com/tas50)) <!-- 17.0.3 -->
- Support more than 10 interfaces [#1479](https://github.com/chef/ohai/pull/1479) ([Babar](https://github.com/Babar)) <!-- 17.0.2 -->
- network: populate pause frame config [#1564](https://github.com/chef/ohai/pull/1564) ([kuba-moo](https://github.com/kuba-moo)) <!-- 17.0.1 -->
diff --git a/VERSION b/VERSION
index 8daea6f5..edd0fe94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.3 \ No newline at end of file
+17.0.4 \ No newline at end of file
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index ec39daf5..582c2ef8 100644
--- a/lib/ohai/version.rb
+++ b/lib/ohai/version.rb
@@ -19,5 +19,5 @@
module Ohai
OHAI_ROOT = File.expand_path(__dir__)
- VERSION = "17.0.3"
+ VERSION = "17.0.4"
end