summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add an integration test of chef-client with empty ENV.ksubrama/no_envKartik Null Cating-Subramanian2015-05-011-2/+19
* Changelog entry for #3316Jay Mundrawala2015-04-301-0/+1
* Merge pull request #3317 from chef/jdm/winstaller-idempotentJay Mundrawala2015-04-301-1/+1
|\
| * windows_package is idempotent againjdm/winstaller-idempotentJay Mundrawala2015-04-301-1/+1
|/
* Merge pull request #3314 from chef/tball/tk14Tyler Ball2015-04-301-2/+2
|\
| * Updating to released test kitchen and kitchen vagranttyler-ball2015-04-301-2/+2
|/
* Note @igorshp's contributionThom May2015-04-301-0/+2
* Update changelog for releasesThom May2015-04-303-66/+7
* Merge pull request #3207 from Igorshp/exception_handlersThom May2015-04-303-6/+17
|\
| * cleaned up rspec testIgor Shpakov2015-04-211-5/+1
| * revised rspec testIgor Shpakov2015-04-201-9/+6
| * updated based on @lamont-granquist commentsIgor Shpakov2015-04-132-2/+1
| * do not overwrite whole @run_status in #build_nodeIgor Shpakov2015-04-112-6/+5
| * small tweak to wordingIgor Shpakov2015-04-091-1/+1
| * added rspec testIgor Shpakov2015-04-091-0/+20
| * patch to always run exception handlersIgor Shpakov2015-04-091-1/+1
* | Merge pull request #3306 from chef/tc/key-deleteTyler Cloke2015-04-297-3/+365
|\ \
| * | Implemented `knife user key delete` and `knife client key delete`.tylercloke2015-04-297-3/+365
|/ /
* | Merge pull request #3235 from jaymzh/yum_archPhil Dibowitz2015-04-294-32/+101
|\ \
| * | Make multipackage and arch play nicely togetherPhil Dibowitz2015-04-294-32/+101
* | | 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