summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implemented `knife user key delete` and `knife client key delete`.tc/key-deletetylercloke2015-04-297-3/+368
* Merge pull request #3297 from chef/tc/key-listTyler Cloke2015-04-298-39/+644
|\
| * Implemented `knife user key list` and `knife client key list`.tc/key-listtylercloke2015-04-298-39/+644
|/
* Merge pull request #3301 from chef/revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|\
| * Revert "Disable Travis CI container infrastructure due to broken IPv6 support"revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|/
* Merge pull request #3296 from juliandunn/disable-travis-containersJulian C. Dunn2015-04-281-1/+0
|\
| * Disable Travis CI container infrastructure due to broken IPv6 support:Julian C. Dunn2015-04-281-1/+0
|/
* Merge pull request #3260 from chef/jdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
|\
| * Use kitchen-appbundle-updaterjdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
* | Merge pull request #3271 from chef/tc/create-keyTyler Cloke2015-04-2810-8/+634
|\ \
| * | Implemented `knife user key create` and `knife client key create`.tylercloke2015-04-289-6/+596
| * | Fixed bug in Chef::Key where create failed to return the full key.tylercloke2015-04-282-11/+37
| * | Set chef_server_root config value to sane defaults.tylercloke2015-04-281-0/+10
|/ /
* | Merge pull request #3279 from chef/lcg/fix-provider-resolver-api-breakThom May2015-04-273-1/+8
|\ \
| * | typo fix in commentlcg/fix-provider-resolver-api-breakLamont Granquist2015-04-271-1/+1
| * | Fix API break in 12.3.0.rc.0Lamont Granquist2015-04-243-1/+8
* | | Merge pull request #3280 from chef/sersut/3234Thom May2015-04-271-0/+1
|\ \ \
| * | | Configure serverspec correctly on windows.sersut/3234Serdar Sutay2015-04-241-0/+1
| |/ /
* | | Merge pull request #3166 from chef/ssd/find-pythonThom May2015-04-252-2/+64
|\ \ \ | |/ / |/| |
| * | Use the same python interpreter as yum when possiblessd/find-pythonSteven Danna2015-03-312-2/+64
* | | 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
|\ \ \ \ | |/ / / |/| | |