summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mcquin/Issue-1910-lwrpmcquin/Issue-1910-lwrpClaire McQuin2014-10-0849-82/+174
|\
| * Merge pull request #2114 from opscode/tball/yajl-replace-jsonTyler Ball2014-10-0849-82/+174
| |\
| | * 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
* | | Update for LWRP changes.Claire McQuin2014-10-081-0/+1
* | | Add :lwrp_redefinition_warnings option to disable warnings.Claire McQuin2014-10-084-36/+44
* | | Merge branch 'master' into mcquin/Issue-1910-lwrpClaire McQuin2014-10-0827-374/+566
|\ \ \ | |/ /
| * | Add line for PR 1980 (FreeBSD pkgng version detection fix).Chris Doherty2014-10-081-0/+1
| * | Directly pushing the forgotten introduction paragraph to useful github queries.Serdar Sutay2014-10-081-0/+2
| * | Merge pull request #2184 from opscode/sersut/useful-github-queriesSerdar Sutay2014-10-081-0/+7
| |\ \
| | * | Add some useful github queries.sersut/useful-github-queriesSerdar Sutay2014-10-071-0/+7
| * | | Merge pull request #1980 from bahamas10/dave-1409788502Chris Doherty2014-10-082-2/+2
| |\ \ \
| | * | | add example stdout to freebsd pkgng test specDave Eddy2014-09-091-1/+1
| | * | | fix FreeBSD pkgng provider (version detection)Dave Eddy2014-09-031-1/+1
| * | | | Merge pull request #2103 from opscode/jdmundrawala/issue-2027-masterJay Mundrawala2014-10-084-153/+167
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | We now check for powershell/dsc compat in provider.jdmundrawala/issue-2027-masterJay Mundrawala2014-09-224-153/+167
| * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
View Lorry Controller Status