summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Add word boundary to mount point regexp in mount mounted functionEric Herot2014-07-301-1/+1
| * | | Add word boundary to mount point regexp in mount disable functionEric Herot2014-07-301-1/+1
* | | | Merge pull request #1694 from jordane/jordane/git_branch_BClaire McQuin2014-08-082-3/+3
|\ \ \ \
| * | | | update git checkout test descriptionJordan Evans2014-07-281-1/+1
| * | | | fix broken testJordan Evans2014-07-251-1/+1
| * | | | use -B in case user wants to reset branchJordan Evans2014-07-251-1/+1
* | | | | Merge pull request #1681 from victorhahncastell/masterClaire McQuin2014-08-082-1/+3
|\ \ \ \ \
| * | | | | Ammended test data to allow unit tests to verify only erb files in the templa...Victor Hahn2014-07-281-0/+2
| * | | | | Apply template syntax check to files in the templates dir only. This avoids f...Victor Hahn - FLEXOPTIX2014-07-231-1/+1
* | | | | | Update for mergesClaire McQuin2014-08-071-0/+25
* | | | | | Merge pull request #1676 from higanworks/use_shared_path_for_deploy_resourceClaire McQuin2014-08-072-1/+6
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into use_shared_path_for_deplo...sawanoboly2014-08-04112-998/+1381
| |\ \ \ \ \ \
| * | | | | | | shared_path can be used to get the path to the shared_pathsawanoboly2014-07-222-1/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1680 from BundesIT/masterClaire McQuin2014-08-073-7/+8
|\ \ \ \ \ \ \
| * | | | | | | whitespace fix in paludis_package.rbtbe2014-07-281-1/+1
| * | | | | | | moved init of timeout for paludis packages to the right placeThomas Berger2014-07-262-5/+1
| * | | | | | | use package.timeout for the cave timeout valueThomas Berger2014-07-252-5/+10
| * | | | | | | fixed paludis package provider manifestThomas Berger2014-07-231-5/+5
| * | | | | | | some paludis fixesThomas Berger2014-07-231-2/+2
| |/ / / / / /
* | | | | | | Merge pull request #1669 from Kasen/pcs_supportClaire McQuin2014-08-071-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Provider mapping for pcs(parallels cloud server) added.Pavel Yudin2014-07-201-0/+9
| |/ / / / / /
* | | | | | | Merge pull request #1667 from parabuzzle/fix_force_flagClaire McQuin2014-08-072-5/+5
|\ \ \ \ \ \ \
| * | | | | | | change syntax of error message to reflect the correct flagMike Heijmans2014-07-191-1/+1
| * | | | | | | update spec output to reflect correct flagMike Heijmans2014-07-191-4/+4
| |/ / / / / /
* | | | | | | Merge pull request #1658 from kgraham/masterClaire McQuin2014-08-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Chef:Provider:Execute's logic on whether or not to use live_stream gets blindlyKevin Graham2014-07-161-1/+1
* | | | | | | | Merge pull request #1638 from bcobb/version-constraint-string-reflects-behaviorClaire McQuin2014-08-073-23/+46
|\ \ \ \ \ \ \ \
| * | | | | | | | VersionConstraint does not need a raw_version attributeBrian Cobb2014-07-141-2/+2
View Lorry Controller Status