summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'chef/master' into fix_osx_profileGregory Batye2017-02-15523-4891/+11257
|\
| * Bump version of chef to 12.19.30 by Chef Versioner.v12.19.30Chef Versioner2017-02-145-10/+11
| * Merge pull request #5816 from chef/lcg/yum-coerce-array-attributesLamont Granquist2017-02-143-5/+55
| |\
| | * coerce immutable arrays to normal arrayslcg/yum-coerce-array-attributesLamont Granquist2017-02-143-5/+55
| * | Bump version of chef to 12.19.29 by Chef Versioner.v12.19.29Chef Versioner2017-02-145-10/+10
| * | Merge pull request #5731 from chef/tm/versioned_apiThom May2017-02-147-0/+381
| |\ \
| | * | Make it easier to have a versioned factorytm/versioned_apiThom May2017-02-145-14/+258
| | * | Beginning of automatic API version detectionThom May2017-02-144-0/+137
| |/ /
| * | Bump version of chef to 12.19.28 by Chef Versioner.v12.19.28Chef Versioner2017-02-145-10/+10
| * | Merge pull request #5806 from chef/rackLamont Granquist2017-02-141-2/+2
| |\ \ | | |/ | |/|
| | * Bump minimum required ruby version to 2.2.2rackTim Smith2017-02-091-2/+2
| * | Bump version of chef to 12.19.27 by Chef Versioner.v12.19.27Chef Versioner2017-02-145-11/+11
| * | Merge pull request #5814 from chef/lcg/fix-more-chefstylesLamont Granquist2017-02-13142-910/+778
| |\ \
| | * | re-fix redundant selflcg/fix-more-chefstylesLamont Granquist2017-02-131-31/+31
| | * | greenify rspecLamont Granquist2017-02-131-58/+58
| | * | fix specs: RedundantReturn, RedundantSelf, RedundantBeginLamont Granquist2017-02-13142-883/+751
| |/ /
| * | Bump version of chef to 12.19.26 by Chef Versioner.v12.19.26Chef Versioner2017-02-125-10/+10
| * | Merge pull request #5712 from chef/lcg/package-cleanupLamont Granquist2017-02-1163-979/+1033
| |\ \
| | * | package provider cleanuplcg/package-cleanupLamont Granquist2017-02-1163-979/+1033
| |/ /
| * | Bump version of chef to 12.19.25 by Chef Versioner.v12.19.25Chef Versioner2017-02-115-10/+10
| * | Merge pull request #5807 from chef/multisshTim Smith2017-02-114-154/+12
| |\ \
| | * | Update Gemfile.lock to avoid corruption failuresmultisshTim Smith2017-02-111-11/+11
| | * | Require net-ssh-multi 1.2.1 and remove our monkeypatchTim Smith2017-02-103-143/+1
| * | | Bump version of chef to 12.19.24 by Chef Versioner.v12.19.24Chef Versioner2017-02-115-10/+10
| * | | Merge pull request #5804 from chef/1219_notesTim Smith2017-02-111-40/+73
| |\ \ \
| | * | | Update release notes for 12.191219_notesTim Smith2017-02-101-40/+73
| | |/ /
| * | | Bump version of chef to 12.19.23 by Chef Versioner.v12.19.23Chef Versioner2017-02-115-10/+14
| * | | Merge pull request #5802 from chef/tduffield/reintroduce-issues-to-changelogThom May2017-02-111-1/+0
| |\ \ \
| | * | | Don't ignore issues when generating the changelogtduffield/reintroduce-issues-to-changelogTom Duffield2017-02-101-1/+0
| * | | | Bump version of chef to 12.19.22 by Chef Versioner.v12.19.22Chef Versioner2017-02-105-10/+10
| * | | | Merge pull request #5808 from chef/typosTim Smith2017-02-101-13/+12
| |\ \ \ \
| | * | | | Fix readme typos and improve list markdownTim Smith2017-02-091-13/+12
| | | |_|/ | | |/| |
| * | | | Bump version of chef to 12.19.21 by Chef Versioner.v12.19.21Chef Versioner2017-02-105-10/+11
| * | | | Merge pull request #5803 from chef/tduffield/suppress-sensitive-propertiesTom Duffield2017-02-102-4/+35
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Keep variable in initial order when sorting propertiestduffield/suppress-sensitive-propertiesTom Duffield2017-02-101-8/+14
| | * | | Suppress sensitive properties from resource outputTom Duffield2017-02-102-5/+30
| |/ / /
| * | | Bump version of chef to 12.19.20 by Chef Versioner.v12.19.20Chef Versioner2017-02-105-10/+10
| | |/ | |/|
| * | Merge pull request #5801 from chef/tduffield/unbreak-version-bumpTom Duffield2017-02-101-1/+2
| |\ \
| | * | Bundle with changelog group for version bumpTom Duffield2017-02-101-1/+2
| |/ /
| * | Merge pull request #5800 from chef/tduffield/un-f-the-worldBryan McLellan2017-02-1016-128/+144
| |\ \
| | * | Fix some Travis failures related to style and gem depstduffield/un-f-the-worldTom Duffield2017-02-105-6/+9
| | * | Update windows rspec filter to fix buildsTom Duffield2017-02-101-1/+4
| | * | Update comment on win32-eventlog pinningTom Duffield2017-02-101-3/+2
| | * | Add back a few gems that are required (and document why)Tom Duffield2017-02-095-5/+14
| | * | Add rake to acceptance Gemfile so we can build native extensionsTom Duffield2017-02-092-0/+3
| | * | Make it so you can actually run rake:dependencies locallyTom Duffield2017-02-092-5/+15
| | * | Cleanup Gemfiles, Berksfiles, and update Gemfile groupsTom Duffield2017-02-096-6/+8
| | * | Remove a lot of old restraintsTom Duffield2017-02-099-116/+103
| |/ /
| * | Bump version of chef to 12.19.19 by Chef Versioner.v12.19.19Chef Versioner2017-02-095-10/+11
| * | Merge pull request #5793 from chef/lcg/data-collector-utf8massterTom Duffield2017-02-092-5/+4
| |\ \