summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-1' of github.com:workmad3/chef into sersut/rebase-chef-1971sersut/rebase-chef-1971Serdar Sutay2014-10-103-13/+27
|\
| * Ensuring no arguments interfere with testsDavid Workman2014-09-142-1/+4
| * Making sure the right data is used throughout the testDavid Workman2014-09-041-3/+4
| * Expanding the file name before checking existanceDavid Workman2014-09-041-2/+1
| * Fixing travis-ci failure.David Workman2014-09-042-1/+1
| * Fixing case of a nil recipe file with chef applyDavid Workman2014-09-032-10/+21
| * Update apply.rbDavid Workman2014-09-031-1/+1
* | Merge pull request #2201 from opscode/sersut/doc-updatesSerdar Sutay2014-10-103-205/+226
|\ \
| * \ Merge branch 'CHEF-4890' of github.com:rathers/chef into sersut/doc-updatessersut/doc-updatesSerdar Sutay2014-10-091-0/+1
| |\ \
| | * | CHEF-4890: Allow gem upgradesDan Rathbone2013-12-171-0/+1
| * | | Spec and CHANGELOG info for: https://github.com/opscode/chef/pull/1184Serdar Sutay2014-10-092-205/+223
| * | | CHANGELOG update for https://github.com/opscode/chef/pull/2193.Serdar Sutay2014-10-091-0/+1
| * | | CHANGELOG update for https://github.com/opscode/chef/pull/2197.Serdar Sutay2014-10-091-0/+1
* | | | Merge pull request #2204 from opscode/tball/latest-ffi-yajlTyler Ball2014-10-102-3/+1
|\ \ \ \
| * | | | Upgrading to latest ffi-yajl which contains fixes for Object#to_jsontyler-ball2014-10-102-3/+1
|/ / / /
* | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
View Lorry Controller Status