summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Removing test that is breaking our tester boxes.jdmundrawala/path-hellJay Mundrawala2014-10-101-26/+0
* Merge pull request #2197 from opscode/sersut/fixup-chef-1662Serdar Sutay2014-10-092-1/+33
|\
| * Keep deprecation of #valid_actions until Chef 13.sersut/fixup-chef-1662Serdar Sutay2014-10-091-1/+1
| * Revert "Remove appending :actions and :valid_actions"Serdar Sutay2014-10-092-1/+33
* | Merge pull request #2193 from opscode/sersut/no-lwrp-class-reloadSerdar Sutay2014-10-097-48/+52
|\ \
| * | Updates based on PR comments.sersut/no-lwrp-class-reloadSerdar Sutay2014-10-092-2/+0
| * | Don't override LWRP resources or providers anymore in Chef 12.Serdar Sutay2014-10-087-46/+52
* | | Merge pull request #1905 from opscode/adamedx/windows-knife-colorAdam Edwards2014-10-092-1/+29
|\ \ \ | |_|/ |/| |
| * | Add specs for Windows color default configadamedx2014-10-091-0/+28
| * | Stop ignoring colored knife output config on Windowsadamedx2014-10-091-1/+1
|/ /
* | Exclude knife integration tests on server platformsBryan McLellan2014-10-0917-16/+19
* | 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
* | 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
|\ \ \ \