summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Adding back `require 'json'` to prevent breaking consumers who currently use ...tball/yajl-replace-jsontyler-ball2014-10-083-10/+6
* Using my ffi-yajl branch where I fixed Objects that do not support to_jsontyler-ball2014-10-071-0/+2
* Updating to latest chef-zero since that dropped json dependencies tootyler-ball2014-10-071-1/+1
* Removing my branch from test kitchen - preparing to merge to mastertyler-ball2014-10-071-1/+1
* My local gemset was including the `json` gem, causing these tests to be ineff...tyler-ball2014-10-0715-16/+23
* Removing old .to_json monkeypatching for all objectstyler-ball2014-10-071-2/+0
* Moving documentation to CHANGELOG since no online documentation needs to upda...tyler-ball2014-10-072-6/+1
* Fixing failing tests. The earlier changes I made to this file were caused by...tyler-ball2014-10-071-0/+5
* Fixing some more changes I missedtyler-ball2014-10-075-8/+8
* Found some JSON pretty printing statements I missedtyler-ball2014-10-073-3/+3
* Updating DOC_CHANGEStyler-ball2014-10-071-1/+6
* Having busser install ffy-yajl gem so it can use it for serverspec test runstyler-ball2014-10-072-1/+4
* ffi_yajl still isn't loading, and when I manually installed it on the host I ...tyler-ball2014-10-072-1/+2
* Trying to eradicate all traces of the JSON gem from Cheftyler-ball2014-10-0739-73/+153
* Merge pull request #2102 from opscode/tball/homebrew-ownerTyler Ball2014-10-0710-132/+307
|\
| * Fixing testtyler-ball2014-10-071-16/+19
| * Moving documentation to a more logical place. Also no longer dis-allowing us...tyler-ball2014-10-073-15/+18
| * Fixing documentation errorstyler-ball2014-10-072-5/+60
| * Missed file on last committyler-ball2014-10-071-3/+2
| * Providing documentation for end-users, updating code with PR commenttyler-ball2014-10-071-0/+35
| * homebrew_owner now tries to run homebrew as the user who owns the `brew` exec...tyler-ball2014-10-079-132/+212
|/
* Merge pull request #2178 from opscode/lcg/serverspec-2Lamont Granquist2014-10-072-64/+21
|\
| * serverspec 2 fixes to e2e testsLamont Granquist2014-10-072-64/+21
* | Add a line for the fix to issue 1563 (broken git shallow-clone).Chris Doherty2014-10-071-0/+1
|/
* Remove space before paren (ruby warning)danielsdeleo2014-10-061-1/+1
* Merge pull request #2154 from opscode/btm/group_functional_testsBryan McLellan2014-10-041-4/+7
|\
| * Cleanup commented out codebtm/group_functional_testsBryan McLellan2014-09-291-2/+0
| * Match group func tests to specificationBryan McLellan2014-09-291-4/+9
* | Merge pull request #2148 from mal/issue/1563Chris Doherty2014-10-032-0/+20
|\ \
| * | Work around breaking change in gitMal Graty2014-10-022-0/+20
* | | Merge pull request #2156 from opscode/lcg/50x-errors-changeloglamont-granquist2014-10-021-0/+2
|\ \ \ | |_|/ |/| |
| * | add changelog for 50x errorslcg/50x-errors-changelogLamont Granquist2014-10-021-0/+2
|/ /
* | Merge pull request #1912 from jessehu/CHEF-ISSUE-1904Claire McQuin2014-10-022-13/+23
|\ \
| * | read http_retry_count from chef config in the spec; add HTTP error code in th...Hui Hu2014-09-042-3/+4
| * | retry on HTTP 50X Error when calling Chef REST APIHui Hu2014-08-252-13/+22
* | | Merge pull request #2141 from opscode/mcquin/Issue-2090Claire McQuin2014-10-021-5/+5
|\ \ \ | |_|/ |/| |
| * | Alias #latest_cookbooks.mcquin/Issue-2090Claire McQuin2014-09-302-10/+5
| * | Deprecate CookbookVersion#latest_cookbooksClaire McQuin2014-09-302-1/+6
* | | Merge pull request #2101 from opscode/mcquin/Issue-1910Claire McQuin2014-10-0110-136/+319
|\ \ \
| * | | Test signal safely on windowsmcquin/Issue-1910Claire McQuin2014-10-012-1/+2
| * | | Fix wording, add updates for interval sleep first, signal processingClaire McQuin2014-10-012-13/+23
| * | | Tidy up some comments, whitespace.Claire McQuin2014-10-013-4/+5
| * | | Update for removed unforked interval client runs.Claire McQuin2014-10-013-0/+18
| * | | Reconfigure signal trapping.Claire McQuin2014-10-013-60/+133
| * | | Do interval and splay sleep before running client.Claire McQuin2014-10-012-25/+26
| * | | Disable unforked interval runs.Claire McQuin2014-10-017-82/+161
|/ / /
* | | Update CHANGELOG for guard updatesBryan McLellan2014-10-011-0/+2
* | | Update guard functional tests for refactoringbtm/guard-orderBryan McLellan2014-10-011-1/+2
* | | Re-remove tests that were removed in 6591d4b2Bryan McLellan2014-10-011-20/+0
* | | Unsupported block exception is now raised by configureBryan McLellan2014-09-301-5/+8
View Lorry Controller Status