diff options
| author | Serdar Sutay <serdar@opscode.com> | 2014-03-20 16:17:40 -0700 |
|---|---|---|
| committer | Serdar Sutay <serdar@opscode.com> | 2014-03-20 16:17:40 -0700 |
| commit | ed87bfe381e0c7ee6304cbfc551624ff34a6f3d2 (patch) | |
| tree | 124194f1b0a988fba036ddb657f90f6890dd14f3 | |
| parent | 78fa9d089cc930501357038b29d4f4f361f53033 (diff) | |
| parent | 7e8d97e46f20e3f27c3c16e8fa3fd562eb5dc56b (diff) | |
| download | ohai-ed87bfe381e0c7ee6304cbfc551624ff34a6f3d2.tar.gz | |
Merge pull request #300 from opscode/CC-55
CC-55: Contribution information for ohai merges.
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | CONTRIBUTIONS.md | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 33f35688..7974b4cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ * Work around libc bug in `hostname --fqdn` * Report Suse and OpenSuse seperately in the :platform attribute. +* CPU information matching linux is now available on darwin. +* ip6address detection failure logging is turned down to :debug. +* fe80:: link-local address is not reported as ip6addresses anymore. +* Private network information is now available as [:rackspace][:private_networks] on Rackspace nodes. ## Last Release: 7.0.0.rc.0 (01/20/2014) diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md index fbb7ac10..10a617f4 100644 --- a/CONTRIBUTIONS.md +++ b/CONTRIBUTIONS.md @@ -7,3 +7,6 @@ Example Contribution: # OHAI Contributions: * **jaymzh**: Work around libc bug in `hostname --fqdn` * **mvidner**: (Long time ago) Added differentiation for suse & opensuse in the :platform attribute. +* **tas50**: Added additional cpu information to darwin platform. +* **mpasternacki**: Removed fe80:: link-local address from reported ip6addresses. +* **paulczar**: Added private network information for Rackspace nodes. |