summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Configure serverspec correctly on windows.sersut/3234Serdar Sutay2015-04-241-0/+1
* Revert "Fix API break in 12.3.0.rc.0"Lamont Granquist2015-04-243-8/+1
* Fix API break in 12.3.0.rc.0Lamont Granquist2015-04-243-1/+8
* Merge pull request #3268 from chef/tm/fix_maintainersThom May2015-04-241-43/+43
|\
| * Fix syntax nits in Maintainers filetm/fix_maintainersThom May2015-04-231-43/+43
|/
* Merge pull request #3254 from chef/jdm/12.4.0.dev12.4.0.dev.0Thom May2015-04-221-1/+1
|\
| * 12.4.0.dev.0 for masterjdm/12.4.0.devJay Mundrawala2015-04-211-1/+1
|/
* Document changes from mergesThom May2015-04-211-0/+6
* Merge pull request #3214 from chef/tc/chef_key_objectTyler Cloke2015-04-203-0/+831
|\
| * Implemented the Key object corrosponding to key rotation API endpoint.tc/chef_key_objecttylercloke2015-04-203-0/+831
|/
* Update CHANGELOG for mergesBryan McLellan2015-04-201-3/+6
* Address review comments from @btmJulian C. Dunn2015-04-201-7/+3
* Address review comment https://github.com/chef/chef/pull/2877#discussion_r263...Julian C. Dunn2015-04-201-18/+0
* Several bugs found during testing:Julian C. Dunn2015-04-201-2/+3
* Gotta do something with that stderr we so carefully captured.Julian C. Dunn2015-04-201-0/+5
* Copy more robust routines from Omnitruck installer.Julian C. Dunn2015-04-201-31/+86
* Rebase and resolve conflicts.Julian C. Dunn2015-04-201-22/+126
* Volunteer to assist as a FreeBSD maintainer.the Bunny Man2015-04-201-2/+9
* Fix nil pointer for windows event loggerJay Mundrawala2015-04-202-5/+25
* Merge pull request #3247 from chef/btm/lower-json-nest-testsBryan McLellan2015-04-203-9/+9
|\
| * Reduce size of nested JSON test to 252 deepbtm/lower-json-nest-testsBryan McLellan2015-04-203-9/+9
|/
* Merge pull request #3238 from chef/jdm/solarisJay Mundrawala2015-04-171-1/+3
|\
| * Unit testify shell_specjdm/solarisJay Mundrawala2015-04-171-1/+3
|/
* Merge pull request #3236 from chef/jdm/3102Jay Mundrawala2015-04-161-1/+1
|\
| * Fix failing specsjdm/3102Jay Mundrawala2015-04-161-1/+1
|/
* Merge pull request #3135 from tomhughes/searchThom May2015-04-162-1/+25
|\
| * Test that search queries make progressSteven Danna2015-03-251-0/+24
| * Ensure that a search query makes progressTom Hughes2015-03-251-1/+1
* | Merge pull request #3102 from chef/btm/lower-json-nest-testsThom May2015-04-163-24/+9
|\ \
| * | Reduce size of json nested entriesBryan McLellan2015-04-153-24/+9
* | | Merge pull request #3077 from chef/lcg/resource_priority_mapLamont Granquist2015-04-1520-86/+531
|\ \ \ | |/ / |/| |
| * | add md filesLamont Granquist2015-04-152-0/+27
| * | move where we dep inject the priority mapsLamont Granquist2015-04-152-6/+7
| * | add resource_resolver and resource_priority_mapLamont Granquist2015-04-1518-86/+503
|/ /
* | Merge pull request #3210 from chef/awesome_community_chefsThom May2015-04-151-69/+89
|\ \
| * | Blog links use chef.io domainawesome_community_chefsnathenharvey2015-04-101-68/+68
| * | 'recognized' is spelled correctlynathenharvey2015-04-101-1/+1
| * | Awesome Community Chefs are listed in the MVPS filenathenharvey2015-04-101-0/+20
* | | Merge pull request #3213 from chef/2140/jm/support_username_passwordJon Morrow2015-04-152-10/+64
|\ \ \
| * | | Fixes 2140 - Honor Proxy from EnvJon Morrow2015-04-142-10/+64
* | | | Merge pull request #3222 from chef/jdm/unpinJay Mundrawala2015-04-141-1/+1
|\ \ \ \
| * | | | New bundler releasedjdm/unpinJay Mundrawala2015-04-141-1/+1
|/ / / /
* | | | Merge pull request #3221 from jaymzh/chef3051clPhil Dibowitz2015-04-131-1/+3
|\ \ \ \
| * | | | Changelog for PR#3051Phil Dibowitz2015-04-131-1/+3
|/ / / /
* | | | Merge pull request #3220 from chef/jdm/bundlerLamont Granquist2015-04-131-1/+1
|\ \ \ \
| * | | | Pin bundler to 1.9.2 in appveyor.ymljdm/bundlerJay Mundrawala2015-04-131-1/+1
|/ / / /
* | | | Merge pull request #3217 from chef/tm/fix_presenter_includeThom May2015-04-131-0/+1
|\ \ \ \
| * | | | explicitly require node presentertm/fix_presenter_includeThom May2015-04-131-0/+1
|/ / / /
* | | | Merge pull request #3051 from mikedodge04/macosx_service_updatePhil Dibowitz2015-04-113-233/+355
|\ \ \ \ | |/ / / |/| | |
| * | | adding assert for plistMike Dodge2015-04-012-5/+11