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.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
|\ \ \
| * | | fising docker recipie namewith_acceptanceMatt Wrock2016-05-171-1/+1
| * | | Pull in updated `chef-acceptance`schisamo/verify-chef-fixSeth Chisamore2016-05-171-1/+1
| * | | copy chef-acceptance suites into $WORKSPACESeth Chisamore2016-05-171-6/+8
| * | | Revert "exit 0 -- its how acceptance works"Seth Chisamore2016-05-171-20/+19
|/ / /
* | | Bump version of chef to 12.10.58 by Chef Versioner.v12.10.58Chef Versioner2016-05-174-9/+9
* | | Merge pull request #4945 from chef/no_acceptanceMatt Wrock2016-05-171-19/+20
|\ \ \
| * | | exit 0 -- its how acceptance worksMatt Wrock2016-05-171-19/+20
|/ / /
* | | Bump version of chef to 12.10.57 by Chef Versioner.v12.10.57Chef Versioner2016-05-174-8/+8
* | | Merge pull request #4941 from chef/omnibusMatt Wrock2016-05-161-2/+2
|\ \ \ | |_|/ |/| |
| * | update omnibus dependency with appx fixMatt Wrock2016-05-161-2/+2
|/ /
* | Bump version of chef to 12.10.56 by Chef Versioner.v12.10.56Chef Versioner2016-05-164-9/+9
* | Merge pull request #4927 from chef/praj/FLOW-382/changelogPrajaktaPurohit2016-05-161-0/+26
|\ \
| * | Update changelog for 12.10.24 releasepraj/FLOW-382/changelogPrajakta Purohit2016-05-121-0/+26
* | | Bump version of chef to 12.10.55 by Chef Versioner.v12.10.55Chef Versioner2016-05-165-13/+13
* | | Merge pull request #4936 from chef/tm/fix_cb_showThom May2016-05-162-100/+95
|\ \ \
| * | | Load cookbook versions correctly for knifetm/fix_cb_showThom May2016-05-162-100/+95
|/ / /
* | | Bump version of chef to 12.10.54 by Chef Versioner.v12.10.54Chef Versioner2016-05-164-12/+12
* | | Merge pull request #4919 from chef/tm/zoloThom May2016-05-1623-129/+185
|\ \ \
| * | | move legacy config into a separate functiontm/zoloThom May2016-05-161-26/+29
| * | | remove dead commentThom May2016-05-161-1/+0
| * | | Ensure that legacy mode and local mode workThom May2016-05-161-90/+120
| * | | Ensure that solo specific code is run at the proper timeThom May2016-05-1622-39/+43
| * | | default to using local modeThom May2016-05-161-28/+48
|/ / /
* | | Bump version of chef to 12.10.53 by Chef Versioner.v12.10.53Chef Versioner2016-05-144-9/+9
* | | Merge pull request #4933 from chef/lcg/better-handler-wiringLamont Granquist2016-05-142-0/+120
|\ \ \
View Lorry Controller Status