summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix error class typo, bump ffi-yajl requirement to pull in bugfixesdanielsdeleo2014-08-122-2/+2
* Clean up DOC_CHANGES.md and update RELEASE_NOTES.md versionBryan McLellan2014-08-122-95/+1
* Fix Tensibai Zhaoying's name in the CHANGELOGBryan McLellan2014-08-121-1/+1
* Merge pull request #1688 from opscode/mcquin/kitchen_with_travisClaire McQuin2014-08-1215-21/+225
|\
| * Update for Travis + Test Kitchenmcquin/kitchen_with_travisClaire McQuin2014-08-121-0/+1
| * Update secure environment variables.Claire McQuin2014-08-123-46/+41
| * Remove .kitchen/ files that crept inClaire McQuin2014-08-123-5105/+0
| * Update for new branch in test-kitchenClaire McQuin2014-08-122-3/+3
| * Add information on using Test Kitchen for E2E testing.Claire McQuin2014-08-122-2/+57
| * Add example test for installed git.Claire McQuin2014-08-128-14/+35
| * Separate .kitchen.ymls for local TK (vagrant) and travis TK (ec2) runsClaire McQuin2014-08-123-14/+17
| * Ignore .kitchen/ and Berksfile.lockClaire McQuin2014-08-121-0/+4
| * Enable Travis to run Test Kitchen on EC2.Claire McQuin2014-08-1211-14/+5244
|/
* Merge pull request #1782 from juliandunn/aix-bff-functional-requires-rootJulian C. Dunn2014-08-111-1/+1
|\
| * AIX functional tests involving BFF need to be run as root.Julian C. Dunn2014-08-081-1/+1
* | Update CHANGELOG for Chef Issues 1754adamedx2014-08-111-0/+1
* | Merge pull request #1787 from opscode/lcg/remove-json-monkeypatchinglamont-granquist2014-08-1134-81/+94
|\ \
| * | remove JSON gem usageLamont Granquist2014-08-1134-81/+94
|/ /
* | Merge pull request #1774 from opscode/adamedx/issue-1754-windows-envAdam Edwards2014-08-112-9/+142
|\ \
| * | Change encoding to Unix, remove inaccuracy in example descriptionadamedx2014-08-111-137/+137
| * | Issue 1754: Chef::Exceptions::Env exception when modifying env resource using...adamedx2014-08-112-9/+142
|/ /
* | Merge pull request #1802 from opscode/lcg/fix-travislamont-granquist2014-08-112-2/+2
|\ \
| * | fix specs broken due to JSON monkeypatching issuesLamont Granquist2014-08-112-2/+2
|/ /
* | Merge pull request #1734 from opscode/jhs/chef_fsBryan McLellan2014-08-111-1/+1
|\ \
| * | Reverse the error wording in Chef::ChefFS::FileSystem#copy_entriesJeremiah Snapp2014-08-011-1/+1
* | | Merge pull request #1786 from opscode/lcg/json-pretty-printlamont-granquist2014-08-115-50/+160
|\ \ \
| * | | add json pretty print tests to some knife show commandsLamont Granquist2014-08-095-50/+160
* | | | Merge branch 'integration-test-refactor'danielsdeleo2014-08-1025-1055/+1680
|\ \ \ \
| * | | | Fix expected format of JSON errors in integration testsdanielsdeleo2014-08-107-48/+34
| * | | | Convert Chef Zero helpers to instance methodsdanielsdeleo2014-08-1022-1024/+1663
|/ / / /
* | | | Merge pull request #1715 from opscode/lcg/file-provider-fixeslamont-granquist2014-08-096-39/+119
|\ \ \ \
| * | | | different operating systems throw different errorsLamont Granquist2014-07-301-1/+1
| * | | | small code rearrangement, avoid re-checksummingLamont Granquist2014-07-301-5/+5
| * | | | validate checksums on downloadsLamont Granquist2014-07-303-1/+29
| * | | | some coderage cleanupLamont Granquist2014-07-301-16/+47
| * | | | add comment on magic behaviorLamont Granquist2014-07-301-0/+1
| * | | | CHEF-5081 functional testLamont Granquist2014-07-301-1/+12
| * | | | bypass idempotency in the cookbook_collection classLamont Granquist2014-07-301-1/+1
| * | | | generate content up frontLamont Granquist2014-07-291-1/+6
| * | | | decide if we're creating/unlinking up frontLamont Granquist2014-07-282-26/+30
* | | | | Merge pull request #1725 from opscode/lcg/log-whyrunlamont-granquist2014-08-093-36/+40
|\ \ \ \ \
| * | | | | log resource should support whyrunLamont Granquist2014-08-093-36/+40
|/ / / / /
* | | | | Revert "remove #to_json Monkeytpatching"Lamont Granquist2014-08-0922-57/+49
* | | | | remove #to_json MonkeypatchingLamont Granquist2014-08-0922-49/+57
| |_|_|/ |/| | |
* | | | Update for mergesClaire McQuin2014-08-081-0/+7
* | | | Merge pull request #1743 from juliandunn/suse-package-removal-failureClaire McQuin2014-08-082-17/+29
|\ \ \ \
| * | | | Add unit test for #1174Julian C. Dunn2014-08-031-16/+28
| * | | | [COOK-4028] zypper remove not working wiht OpenSuse 13.1Boris Komraz2014-08-031-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1719 from evertrue/evertrue/eherot/add_mount_point_word_b...Claire McQuin2014-08-082-5/+14
|\ \ \ \
| * | | | Test for mount regexps that match more than they are supposed toEric Herot2014-07-301-3/+12