diff options
| author | sersut <serdar@opscode.com> | 2014-05-23 12:27:31 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-05-23 12:27:31 -0700 |
| commit | 90f0383570aea6f6a1e8cbe460a11a96edf0fb59 (patch) | |
| tree | 87c7b931a90a8dd74daddb72f585d8c9e6dec105 | |
| parent | 15db9301b293194ccbac25f1b9ae17ae9da9fa94 (diff) | |
| download | ohai-90f0383570aea6f6a1e8cbe460a11a96edf0fb59.tar.gz | |
Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | CONTRIBUTIONS.md | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4611c088..9cd6f872 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,13 @@ ## Unreleased -* Work around libc bug in `hostname --fqdn` +* [**Phil Dibowitz**](https://github.com/jaymzh): + Work around libc bug in `hostname --fqdn` +* [**Phil Dibowitz**](https://github.com/jaymzh): + Add timeouts to 'df' and 'mount' commands + * java -version wastes memory (OHAI-550) -* Add timeouts to 'df' and 'mount' commands -## Last Release: 7.0.0.rc.0 (01/20/2014) +## Last Release: 6.20.0 (01/20/2014) http://www.getchef.com/blog/2014/01/20/ohai-7-0-release-candidate/ diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md deleted file mode 100644 index 08da3ac6..00000000 --- a/CONTRIBUTIONS.md +++ /dev/null @@ -1,9 +0,0 @@ -<!--- -This file is reset every time a new release is done. The contents of this file are for the currently unreleased version. - -Example Contribution: -* **kalistec**: Improved file resource greatly. ---> -# OHAI Contributions: -* **jaymzh**: Work around libc bug in `hostname --fqdn` -* **jaymzh**: Add timeouts to 'df' and 'mount' commands |