summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into merging-mastermerging-mastertyler-ball2014-12-0588-687/+443
|\
| * pinning ohai to 8.xLamont Granquist2014-12-031-1/+1
| * setting master to 12.1.0.dev.0 to drop ancient devodd policyLamont Granquist2014-12-031-1/+1
| * Merge pull request #2532 from juliandunn/remove-agentJulian C. Dunn2014-12-032-19/+0
| |\
| | * Remove unused "agent".Julian C. Dunn2014-12-032-19/+0
| * | Merge pull request #2527 from opscode/lcg/knife-plugin-fixLamont Granquist2014-12-034-6/+23
| |\ \ | | |/ | |/|
| | * Fix knife plugin path searchingLamont Granquist2014-12-034-6/+23
| |/
| * Merge pull request #2516 from adamhjk/ez-modeAdam Jacob2014-12-022-0/+19
| |\
| | * A memorial for Ezra ZygmuntowiczAdam Jacob2014-12-012-0/+19
| * | Merge pull request #2526 from opscode/mcquin/maintainerAdam Jacob2014-12-021-23/+19
| |\ \
| | * | Add myself as a core maintainer.Claire McQuin2014-12-021-0/+1
| | * | Use lists.Claire McQuin2014-12-021-23/+18
| |/ /
| * | adding myself to MAINTAINERSLamont Granquist2014-12-011-1/+10
| * | Add myself to MAINTAINERSdanielsdeleo2014-12-011-0/+4
| * | Merge pull request #2499 from juliandunn/trash-shefJoshua Timberman2014-12-013-55/+1
| |\ \ | | |/ | |/|
| | * Remove all parts of 'shef'Julian C. Dunn2014-11-263-55/+1
| * | Add Seth Vargo as LT for ChefSpecAdam Jacob2014-12-011-3/+5
| * | Merge pull request #2510 from opscode/tball/maintainerAdam Jacob2014-12-011-0/+5
| |\ \
| | * | Fixing formattingtball/maintainertyler-ball2014-12-011-0/+4
| | * | Adding myself as a maintainertyler-ball2014-12-011-1/+2
| |/ /
| * | Merge pull request #2490 from jtimberman/jtimberman/maintainersJon Cowie2014-11-281-0/+5
| |\ \
| | * | Adding myself to relevant component maintainerjtimberman2014-11-281-0/+5
| |/ /
| * | Merge pull request #2485 from opscode/ssd/maintainer-appJon Cowie2014-11-281-1/+2
| |\ \ | | |/ | |/|
| | * Add Steven Danna as a maintainer of Dev Toolsssd/maintainer-appSteven Danna2014-11-251-1/+2
| * | Ensure 'uri' is required where it's used.danielsdeleo2014-11-265-0/+5
| * | Remove 1.8 and 1.9 specific monkey patchesdanielsdeleo2014-11-2615-412/+0
| * | Force TK to install prerelease Chef pkg for nowdanielsdeleo2014-11-261-1/+1
| * | Remove 1.9 from travis, bump 2.1 to .5 patch releasedanielsdeleo2014-11-261-4/+3
| * | update docs for dropping support of 1.9.3Lamont Granquist2014-11-263-3/+5
| * | drop ruby 1.9.x support for Chef-12Lamont Granquist2014-11-251-1/+1
| * | Merge pull request #2484 from opscode/tball/contrib-passTyler Ball2014-11-2549-75/+104
| |\ \
| | * \ Merge branch 'master' into tball/contrib-passtyler-ball2014-11-258-5/+119
| | |\ \
| | * | | Fixing failing tests on mergetyler-ball2014-11-251-4/+4
| | * | | Contribution information for https://github.com/opscode/chef/pull/2385tyler-ball2014-11-251-0/+2
| | * | | Contribution information for https://github.com/opscode/chef/pull/2382tyler-ball2014-11-251-0/+2
| | * | | Merge branch 'master' of https://github.com/tas50/chef-1 into tball/contrib-passtyler-ball2014-11-253-8/+8
| | |\ \ \
| | | * | | Fix some minor typosTim Smith2014-11-083-9/+9
| | * | | | Merge branch 'typofixes-vlajos-20141107' of github.com:vlajos/chef into tball...tyler-ball2014-11-2545-61/+61
| | |\ \ \ \
| | | * | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-0845-61/+61
| | | |/ / /
| | * | | | Contribution information for https://github.com/opscode/chef/pull/2242tyler-ball2014-11-251-0/+2
| | * | | | Merge branch 'patch-3' of github.com:justanshulsharma/cheftyler-ball2014-11-252-6/+29
| | |\ \ \ \
| | | * | | | Update node_run_list_remove_spec.rbAnshul Sharma2014-11-041-1/+1
| | | * | | | swapped linesAnshul Sharma2014-11-041-2/+2
| | | * | | | added testsAnshul Sharma2014-10-181-3/+18
| | | * | | | Updated bannerAnshul Sharma2014-10-181-1/+1
| | | * | | | remove extra spacesAnshul Sharma2014-10-161-3/+0
| | | * | | | knife node run_list remove issue #2186Anshul Sharma2014-10-161-2/+13
| * | | | | | Merge pull request #2459 from opscode/lcg/partial-deep-merge-cacheLamont Granquist2014-11-250-0/+0
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | add more commentarylcg/partial-deep-merge-cacheLamont Granquist2014-11-201-4/+20
| | * | | | | add partial deep merge cacheLamont Granquist2014-11-203-12/+65