diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-11-25 14:45:10 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-11-25 14:45:10 -0800 |
| commit | 2e3ea9d76d4b8e912ff88b22b9cb29b9c8d9009c (patch) | |
| tree | 70c0ccd28fab446b92a5db0ce6797fcfd49f7e2a /CHANGELOG.md | |
| parent | 2cabf9c5ba969ff89128d5334e36a76c766fce93 (diff) | |
| parent | 5bab29b02248a4468a7fbf7f6226c30255c3abe3 (diff) | |
| download | chef-2e3ea9d76d4b8e912ff88b22b9cb29b9c8d9009c.tar.gz | |
Merge branch 'master' into tball/contrib-pass
Conflicts:
CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c1592d823..35ad446cb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ removed securerandom patch * [**Scott Bonds**](https://github.com/bonds) add package support for OpenBSD +* [**Lucy Wyman**](https://github.com/lucywyman) + Added support for handling empty version strings to rubygems provider. +* [**Yulian Kuncheff**](https://github.com/Daegalus) + Correctly set the pre-release identifier during knife bootstrap. * [**Anshul Sharma**](https://github.com/justanshulsharma) `knife node run_list remove` now accepts run_list options in the same form as add * [**Veres Lajos**](https://github.com/vlajos) |