summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add Steven Danna as a maintainer of Dev Toolsssd/maintainer-appSteven Danna2014-11-251-1/+2
* Merge pull request #2483 from opscode/sersut/contrib-passSerdar Sutay2014-11-255-2/+28
|\
| * Contribution information for https://github.com/opscode/chef/pull/2439.Serdar Sutay2014-11-251-0/+2
| * Merge branch 'fix_prerelease_parameter' of github.com:Daegalus/chefSerdar Sutay2014-11-252-1/+15
| |\
| | * Fix installer_version_string to be an array on prerelease parameter.Yulian Kuncheff2014-11-242-1/+15
| * | Contribution information for https://github.com/opscode/chef/pull/2452.Serdar Sutay2014-11-251-0/+2
| * | Merge branch 'empty_version' of github.com:lucywyman/chefSerdar Sutay2014-11-252-1/+9
| |\ \
| | * | Setting version to an empty string in testslucywyman2014-11-192-1/+9
* | | | Merge pull request #2423 from jonlives/masterAdam Jacob2014-11-251-0/+88
|\ \ \ \ | |/ / / |/| | |
| * | | Add @jaymzh as core maintainerJon Cowie2014-11-141-0/+2
| * | | Adding MAINTAINERS.md file per RFC-030 and proposing myself as maintainer for...Jon Cowie2014-11-141-0/+86
* | | | Merge pull request #2445 from juliandunn/remove-travis-187-workaroundJulian C. Dunn2014-11-241-11/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Put back "gem update --system"Julian C. Dunn2014-11-181-0/+4
| * | | Revert 7ff6de20561ba20b0a6876c66e1ddd3271a10084 as we don't need itJulian C. Dunn2014-11-181-13/+0
* | | | Merge pull request #2462 from opscode/lcg/remove-knockout-mergeSerdar Sutay2014-11-238-94/+109
|\ \ \ \
| * | | | 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
| * | | | remove invalid invalidsubtractivemerge specsLamont Granquist2014-11-211-26/+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
|/ / / /
* | | | Merge pull request #2464 from opscode/lcg/to-hash-specsLamont Granquist2014-11-211-0/+28
|\ \ \ \
| * | | | adding some more specs around to_hashlcg/to-hash-specsLamont Granquist2014-11-201-0/+28
|/ / / /
* | | | Merge pull request #2447 from opscode/lcg/lazy-deep-merge2Serdar Sutay2014-11-195-105/+131
|\ \ \ \
| * | | | revert to serdar's deep_merge de-dup versionLamont Granquist2014-11-191-4/+16
| * | | | typo fix in specsLamont Granquist2014-11-191-1/+1
| * | | | add specs busted by dup removalLamont Granquist2014-11-191-0/+34
| * | | | fix reset_cache specs busted by removing thatLamont Granquist2014-11-191-44/+0
| * | | | 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-192-0/+67
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2073 from opscode/ryan/group_post-mastertball/restore-050d148Serdar Sutay2014-11-192-0/+67
| |\ \ \
| | * | | Add unit test for group normalization in ChefFSRyan Cragun2014-11-191-0/+63
| | * | | Populate the actors when creating groupsRyan Cragun2014-11-191-0/+4
* | | | | Merge pull request #2425 from opscode/lcg/memoize-localemh/recoverLamont Granquist2014-11-182-36/+36
|\ \ \ \ \
| * | | | | stop recomputing locale -a constantlylcg/memoize-localeLamont Granquist2014-11-172-36/+36
| |/ / / /
* | | | | Fix typo in release notes.Julian C. Dunn2014-11-181-1/+1
| |_|/ / |/| | |
* | | | Merge pull request #2424 from opscode/sersut/chef-2356Serdar Sutay2014-11-174-11/+69
|\ \ \ \
| * | | | 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-143-11/+61
* | | | | 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 pull request #2421 from opscode/lcg/faster-rspecLamont Granquist2014-11-142-19/+25
|\ \ \ \ \ | |_|/ / / |/| | | |
View Lorry Controller Status