summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tball/contrib-passtyler-ball2014-11-253-3/+3
|\
| * suppress locale -a warnings on windowsLamont Granquist2014-11-251-1/+1
| * Merge branch 'fix_prerelease_parameter' of github.com:Daegalus/chefSerdar Sutay2014-11-251-1/+1
| |\
| | * Fix installer_version_string to be an array on prerelease parameter.Yulian Kuncheff2014-11-241-1/+1
| * | Merge branch 'empty_version' of github.com:lucywyman/chefSerdar Sutay2014-11-251-1/+1
| |\ \ | | |/ | |/|
| | * Setting version to an empty string in testslucywyman2014-11-191-1/+1
* | | Merge branch 'typofixes-vlajos-20141107' of github.com:vlajos/chef into tball...tyler-ball2014-11-2519-24/+24
|\ \ \
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-0819-24/+24
* | | | Merge branch 'patch-3' of github.com:justanshulsharma/cheftyler-ball2014-11-251-3/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Updated bannerAnshul Sharma2014-10-181-1/+1
| * | | remove extra spacesAnshul Sharma2014-10-161-3/+0
| * | | knife node run_list remove issue #2186Anshul Sharma2014-10-161-2/+13
* | | | WIP: immutabilizing deep mergelcg/remove-knockout-mergeLamont Granquist2014-11-213-6/+20
* | | | deleted the last end accidentallyLamont Granquist2014-11-212-2/+5
* | | | #role_merge becomes #merge not #deep_mergeLamont Granquist2014-11-211-3/+2
* | | | role_merge can be elmianted nowLamont Granquist2014-11-212-11/+2
* | | | remove InvalidSubtractiveMerge classLamont Granquist2014-11-211-2/+0
* | | | provider resolver perf improvementLamont Granquist2014-11-211-2/+2
* | | | remove old knockout merge exceptionLamont Granquist2014-11-211-33/+0
* | | | add more commentaryLamont Granquist2014-11-211-4/+20
* | | | add partial deep merge cacheLamont Granquist2014-11-213-12/+65
* | | | revert to serdar's deep_merge de-dup versionLamont Granquist2014-11-191-4/+16
* | | | fix ImmutableAttributeModification exceptionLamont Granquist2014-11-193-8/+9
* | | | remove cache resettingLamont Granquist2014-11-192-9/+0
* | | | remove lots of useless deep merge dupingLamont Granquist2014-11-191-2/+2
* | | | WIP: lazy deep mergingLamont Granquist2014-11-191-46/+78
* | | | Merge branch 'tball/restore-050d148' - this merges PR https://github.com/opsc...tyler-ball2014-11-191-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2073 from opscode/ryan/group_post-mastertball/restore-050d148Serdar Sutay2014-11-191-0/+4
| |\ \ \
| | * | | Populate the actors when creating groupsRyan Cragun2014-11-191-0/+4
* | | | | Merge pull request #2425 from opscode/lcg/memoize-localemh/recoverLamont Granquist2014-11-181-33/+33
|\ \ \ \ \
| * | | | | stop recomputing locale -a constantlylcg/memoize-localeLamont Granquist2014-11-171-33/+33
| |/ / / /
* | | | | Merge pull request #2424 from opscode/sersut/chef-2356Serdar Sutay2014-11-173-9/+46
|\ \ \ \ \
| * | | | | Dedicated error for content staging issues. Comment fixes in config.rb.Serdar Sutay2014-11-173-4/+11
| * | | | | Fixes based on PR comments.sersut/chef-2356Serdar Sutay2014-11-141-8/+9
| * | | | | Introduct :auto mode for :file_staging_uses_destdir which tries the dest_dir ...Serdar Sutay2014-11-142-9/+38
| |/ / / /
* | | | | Merge pull request #2427 from opscode/jdmundrawala/path-sep-refactorJay Mundrawala2014-11-171-10/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use platform_specific_path in chef shelljdmundrawala/path-sep-refactorJay Mundrawala2014-11-141-10/+2
* | | | | Merge branch 'chef-dk-227' into 11-stabledanielsdeleo2014-11-131-0/+24
* | | | | add comment about stems with flavorsScott Bonds2014-11-131-1/+1
* | | | | use PKG_PATH instead of PACKAGEROOT/SITEScott Bonds2014-11-131-8/+4
* | | | | add support for double-dash in package nameScott Bonds2014-11-131-4/+21
* | | | | misc cleanupScott Bonds2014-11-132-6/+6
* | | | | fix candidate_version return valueScott Bonds2014-11-131-4/+7
* | | | | simplify openbsd package providerScott Bonds2014-11-131-154/+19
* | | | | add openbsd package providerScott Bonds2014-11-135-1/+281
* | | | | removed securerandom patchAnshul Sharma2014-11-133-46/+2
* | | | | Fix rubygems provider to use https instead of http.Nathan Cerny2014-11-131-1/+1
* | | | | cleanup cookbook path from stale filesVasiliy Tolstov2014-11-131-0/+2
* | | | | Merge pull request #2331 from justanshulsharma/patch-2Lamont Granquist2014-11-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | File.exists? is deprecated in favor of File.exist?Anshul Sharma2014-10-311-1/+1