Release 8.26.08.26

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 13 insertions, 37 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 198f5f14..b110de6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## [8.26.0](https://github.com/chef/ohai/tree/v8.26.0) (2018-01-10)
+
+- [mdadm] Handle journal and spare devices properly [#1102](https://github.com/chef/ohai/pull/1102)
+- [linux/network] Tunnel information [#1105](https://github.com/chef/ohai/pull/1105)
+- Add a plugin to provide PCI bus information using `lspci` [#1108](https://github.com/chef/ohai/pull/1108)
+- Support new C5/M5 instance types in EC2 [#1111](https://github.com/chef/ohai/pull/1111)
+
 ## [8.25.1](https://github.com/chef/ohai/tree/v8.25.1) (2017-11-15)
 
 [Full Changelog](https://github.com/chef/ohai/compare/v8.25.0...v8.25.1)
@@ -14,6 +21,7 @@
 - Fix solaris2 ipaddress attribute search [#1028](https://github.com/chef/ohai/pull/1028)
 
 ## [8.24.0](https://github.com/chef/ohai/tree/v8.24.1) (2017-06-21)
+
 [Full Changelog](https://github.com/chef/ohai/compare/v8.24.0...v8.24.1)
 
 - Bumped chefstyle development dependency
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 13018827..f096e32b 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,43 +1,11 @@
-<!---
-This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
+# Ohai Release Notes:
 
-Example Note:
+## 8.26
 
-## Example Heading
-Details about the thing that changed that needs to get included in the Release Notes in markdown.
--->
+### EC2 detection on C5/M5
 
-# Unreleased
+Ohai now provides EC2 metadata configuration information on the new C5/M5 instance types running on Amazon's new hypervisor.
 
 ### LsPci Plugin
 
 The new LsPci plugin provides a `node[:pci]` hash with information about the PCI bus based on `lspci`. Only runs on Linux.
-
-# Ohai Release Notes:
-
-## Upcoming Chef/Ohai 13 release
-
-This April we'll be releasing Chef 13, and with the Chef 13 release we'll also be bumping the Ohai version to 13 to match. This release of Ohai will be the last 8.X release before we begin merging changes for Ohai 13.
-
-
-## Cumulus Linux Platform
-
-Cumulus Linux will now be detected as platform `cumulus` instead of `debian` and the `platform_version` will be properly set to the Cumulus Linux release.
-
-## Virtualization Detection
-
-Windows / Linux / BSD guests running on the Veertu hypervisors will now be detected
-
-Windows guests running on Xen and Hyper-V hypervisors will now be detected
-
-## New Sysconf Plugin
-
-A new plugin parses the output of the sysconf command to provide information on the underlying system.
-
-## AWS Account ID
-
-The EC2 plugin now fetches the AWS Account ID in addition to previous instance metadata
-
-## GCC Detection
-
-GCC detection has been improved to collect additional information, and to not prompt for the installation of Xcode on macOS systems
diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb
index 660aea96..619c1655 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 = "8.25.1"
+  VERSION = "8.26.0"
 end