summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Un-remove ExpandNodeObject#load_node, deprecate itpolicybuilder-load-node-unremovedanielsdeleo2015-10-012-0/+59
* Merge branch 'jk/external-tests'John Keiser2015-09-3010-70/+96
|\
| * Ship our Gemfile so people can run our tests from the gemjk/external-testsJohn Keiser2015-09-303-11/+11
| * Don't add the external tests stuff to the main GemfileJohn Keiser2015-09-302-11/+22
| * Add cheffish, chef-zero, chef-provisioning and chef-provisioning-aws specsJohn Keiser2015-09-303-14/+30
| * Add external tests for chefspec, chef-sugar, chef-rewind, foodcritic and poiseJohn Keiser2015-09-309-65/+64
* | Bump revision to 12.5.0jk/12.5.0-updateJohn Keiser2015-09-304-4/+4
|/
* Add ability for default to override name_propertyjk/name-defaultJohn Keiser2015-09-292-4/+19
* This wasn't intended to be a protected method.Noah Kantrowitz2015-09-291-3/+3
* Merge branch 'jk/print-race'John Keiser2015-09-292-149/+177
|\
| * Simplify kill loop with WNOHANGjk/print-raceJohn Keiser2015-09-291-10/+3
| * Change puts to print with \n for atomicityJohn Keiser2015-09-291-7/+7
| * Add some insurance against timeouts failing (10s room, kill loop)John Keiser2015-09-291-5/+14
| * Add tests for things that have created the lockfile but not yet acquired the ...John Keiser2015-09-292-42/+109
| * Print what happened (and in what order) if test failsJohn Keiser2015-09-291-130/+89
|/
* Make sure name_attribute works on derived propertiesjk/name-attribute-dupJohn Keiser2015-09-292-3/+53
* Merge pull request #3978 from tas50/knife-wording-2Thom May2015-09-2910-45/+45
|\
| * Update more references from cookbooks -> supermarketTim Smith2015-09-273-30/+30
| * Update specs for SupermarketTim Smith2015-09-271-3/+3
| * Capitalize another messageTim Smith2015-09-271-1/+1
| * Supermarket vs. the SupermarketTim Smith2015-09-272-3/+3
| * More Community site -> SupermarketTim Smith2015-09-271-4/+4
| * Fix tenseTim Smith2015-09-271-1/+1
| * Capitalize first word in sentencesTim Smith2015-09-272-3/+3
| * Fix error message to mention Supermarket not community siteTim Smith2015-09-271-2/+2
| * Copyright doesn't need to be capitalizedTim Smith2015-09-271-1/+1
* | Merge pull request #3989 from chef/jk/api-private-resource-collectionThom May2015-09-291-5/+3
|\ \
| * | Make resource_collection= @api private instead of deprecatedjk/api-private-resource-collectionJohn Keiser2015-09-281-5/+3
* | | Merge pull request #3995 from chef/tm/fix_omnitruck_urlLamont Granquist2015-09-291-1/+1
|\ \ \
| * | | fix omnitruck urlThom May2015-09-291-1/+1
* | | | Merge pull request #3993 from chef/jk/win-provider-resolver-testsThom May2015-09-291-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix provider_resolver tests on Windowsjk/win-provider-resolver-testsJohn Keiser2015-09-291-0/+4
| |/ /
* | | Merge pull request #3976 from tas50/bootstrapLamont Granquist2015-09-291-4/+3
|\ \ \
| * | | Bootstrap doc doesnt match realityTim Smith2015-09-261-4/+3
| | |/ | |/|
* | | Merge pull request #3975 from tas50/contribSteven Murawski2015-09-291-7/+3
|\ \ \
| * | | Fix awkward wording in the contributing docTim Smith2015-09-261-7/+3
| |/ /
* | | Merge pull request #3985 from chef/irving/issue3671Irving Popovetsky2015-09-293-3/+21
|\ \ \
| * | | Update changelog for #3985Irving Popovetsky2015-09-291-0/+1
| * | | Use much simpler regex for determining the rpm versionIrving Popovetsky2015-09-292-3/+20
| | |/ | |/|
* | | Merge pull request #3912 from chef/mcquin/release-notesThom May2015-09-291-2/+5
|\ \ \ | |/ / |/| |
| * | Windows cookbook dependencies should be updated for Chef 12.5mcquin/release-notesClaire McQuin2015-09-111-2/+5
* | | Make service_providers return the providersJohn Keiser2015-09-281-6/+10
* | | Merge branch 'jk/systemctl-shenanigans'John Keiser2015-09-286-684/+784
|\ \ \
| * | | Get rid of state-keeping and reset in ServiceHelpersjk/systemctl-shenanigansJohn Keiser2015-09-282-32/+19
| * | | Add test for nonzero systemctl exit codeJohn Keiser2015-09-287-771/+766
| * | | Add system providers to the list of world-stubbed stuffJohn Keiser2015-09-284-63/+91
| * | | Test more of provider resolution by mocking the filesystem and commandsJohn Keiser2015-09-282-6/+96
| * | | return empty array if no services foundRanjib Dey2015-09-281-1/+1
|/ / /
* | | Merge branch 'ad/remote-dir-fix'John Keiser2015-09-282-1/+75
|\ \ \ | |_|/ |/| |
| * | Add spec for remote dir fixJohn Keiser2015-09-281-0/+74