diff options
| author | sersut <serdar@opscode.com> | 2014-05-23 12:18:13 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-05-23 12:18:13 -0700 |
| commit | feffb7fe0b4ae39fe5e20600cb3407f0506119a7 (patch) | |
| tree | d0e866897ab37569d5256233f1786c8b153a9d1c | |
| parent | 4f1051d0550258429a9d72d7c36fc61930c01975 (diff) | |
| download | chef-feffb7fe0b4ae39fe5e20600cb3407f0506119a7.tar.gz | |
Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.
| -rw-r--r-- | CHANGELOG.md | 14 | ||||
| -rw-r--r-- | CONTRIBUTIONS.md | 16 |
2 files changed, 10 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0908755801..40566b713a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,16 @@ ## 10.32.2 -* Service Provider for MacOSX now supports `enable` and `disable` -* Chef now gracefully handles corrupted cache files. -* SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) -* bump up upper limit on json gem to 1.8.1 (CHEF-4632) +* [**Phil Dibowitz**](https://github.com/jaymzh): + Service Provider for MacOSX now supports `enable` and `disable` +* [**Phil Dibowitz**](https://github.com/jaymzh): + Chef now gracefully handles corrupted cache files. +* [**Phil Dibowitz**](https://github.com/jaymzh): + SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) +* [**Phil Dibowitz**](https://github.com/jaymzh): + bump up upper limit on json gem to 1.8.1 (CHEF-4632) + + * pin sdoc to 0.3.0 due to solaris packaging issues. ## Last Release: 10.30.4 (02/18/2014) diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md deleted file mode 100644 index 9e26074816..0000000000 --- a/CONTRIBUTIONS.md +++ /dev/null @@ -1,16 +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. ---> -# Chef Client 10.34.0 Contributions: -* - - -# Chef Client 10.32.2 Contributions: - -* **jaymzh**: Service Provider for MacOSX now supports `enable` and `disable` -* **jaymzh**: Chef now gracefully handles corrupted cache files. -* **jaymzh**: SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172) -* **jaymzh**: bump up upper limit on json gem to 1.8.1 (CHEF-4632) |