summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Update .mailmap with a few more entriesssd/mailmap-updatesSteven Danna2016-05-201-6/+59
* | | | | | Bump version of chef to 12.11.7 by Chef Versioner.v12.11.7Chef Versioner2016-05-264-8/+8
* | | | | | Merge pull request #4967 from chef/lcg/kitchen-tests3Lamont Granquist2016-05-265-16/+85
|\ \ \ \ \ \
| * | | | | | add a few more distros to kitchen testinglcg/kitchen-tests3Lamont Granquist2016-05-255-16/+85
* | | | | | | Bump version of chef to 12.11.6 by Chef Versioner.v12.11.6Chef Versioner2016-05-264-8/+8
* | | | | | | Bump version of chef to 12.11.5 by Chef Versioner.v12.11.5Chef Versioner2016-05-264-8/+8
* | | | | | | use a version ofm bundler that we haveMatt Wrock2016-05-251-1/+1
* | | | | | | Merge pull request #4970 from chef/stupidMatt Wrock2016-05-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix delete in bundle-platformMatt Wrock2016-05-251-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4965 from chef/bun_1_11Matt Wrock2016-05-253-15/+30
|\ \ \ \ \ \ \
| * | | | | | | fix bundle locking on bundler 1.12 and enforce version we wantbun_1_11Matt Wrock2016-05-253-15/+30
* | | | | | | | Bump version of chef to 12.11.4 by Chef Versioner.v12.11.4Chef Versioner2016-05-259-20/+19
* | | | | | | | Merge pull request #4901 from chef/lcg/yum-readabilityLamont Granquist2016-05-255-959/+1049
|\ \ \ \ \ \ \ \
| * | | | | | | | break yum provider out into fileslcg/yum-readabilityLamont Granquist2016-05-255-959/+1049
|/ / / / / / / /
* | | | | | | | Merge pull request #4960 from tas50/old_webhooksLamont Granquist2016-05-251-10/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove old webhooks from TravisTim Smith2016-05-201-10/+0
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #4928 from chef/lcg/kitchen-tests3Lamont Granquist2016-05-2416-312/+412
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | fixes from PR reviewLamont Granquist2016-05-241-1/+2
| * | | | | | convert kitchen tests to docker + other fixesLamont Granquist2016-05-2416-312/+411
|/ / / / / /
* | | | | | Merge pull request #4961 from tas50/miscMatt Wrock2016-05-232-5/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Opscode -> Chef and remove old roadmap itemsTim Smith2016-05-202-5/+1
| |/ / / /
* | | | | Merge pull request #4611 from chef/smurawski/rfc062-exit-status-chef-clientSteven Murawski2016-05-2313-35/+770
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | * define exit codesSteven Murawski2016-05-2313-35/+770
|/ / / /
* | | | Bump version of chef to 12.11.3 by Chef Versioner.v12.11.3Chef Versioner2016-05-204-16/+16
* | | | Merge pull request #4962 from tas50/docsSteven Murawski2016-05-202-38/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Update contributing doc to better reflect realityTim Smith2016-05-202-38/+3
|/ / /
* | | Bump version of chef to 12.11.2 by Chef Versioner.v12.11.2Chef Versioner2016-05-194-9/+9
* | | Merge pull request #4953 from chef/minor_versionMatt Wrock2016-05-191-0/+10
|\ \ \
| * | | update readme regarding minor version bumpminor_versionMatt Wrock2016-05-181-0/+10
* | | | Bump version of chef to 12.11.1 by Chef Versioner.v12.11.1Chef Versioner2016-05-194-9/+9
* | | | Merge pull request #4952 from chef/praj/version_bumpPrajaktaPurohit2016-05-184-13/+13
|\ \ \ \ | |/ / / |/| | |
| * | | Updating version after Chef 12.10 releasepraj/version_bumpPrajakta Purohit2016-05-184-13/+13
|/ / /
* | | Bump version of chef to 12.10.60 by Chef Versioner.v12.10.60Chef Versioner2016-05-184-8/+8
* | | Merge pull request #4951 from chef/jk/version-bumpJohn Keiser2016-05-181-5/+5
|\ \ \
| * | | Correct Gemfile.lockjk/version-bumpJohn Keiser2016-05-181-5/+5
|/ / /
* | | Merge pull request #4940 from chef/jk/licensesJohn Keiser2016-05-1811-0/+37
|\ \ \ | |_|/ |/| |
| * | Add licenses to all software defsjk/licensesJohn Keiser2016-05-1811-0/+37
|/ /
* | Merge pull request #4942 from chef/lcg/universal-dslThom May2016-05-186-30/+88
|\ \
| * | typeofix thanks @ranjiblcg/universal-dslLamont Granquist2016-05-171-1/+1
| * | update for feedback from stevenLamont Granquist2016-05-173-0/+3
| * | create 'universal' DSLLamont Granquist2016-05-166-30/+85
* | | Merge pull request #4902 from MichaelPereira/handle-user-id-git-resourceThom May2016-05-182-1/+42
|\ \ \
| * | | remove extra space from expected unit test outputMichael Pereira2016-05-101-1/+1
| * | | try @thommay suggestion for resolving unit test issueMichael Pereira2016-05-101-1/+1
| * | | remove trailing spaceMichael Pereira2016-05-061-1/+0
| * | | take @coderanger review comments into accountMichael Pereira2016-05-051-4/+1
| * | | typo in error logMichael Pereira2016-05-051-1/+1
| * | | Handle numeric id for the user value in the git resourceMichael Pereira2016-05-052-1/+46
* | | | Bump version of chef to 12.10.59 by Chef Versioner.v12.10.59Chef Versioner2016-05-184-8/+8
* | | | Merge pull request #4950 from chef/with_acceptanceMatt Wrock2016-05-173-22/+23
|\ \ \ \