summaryrefslogtreecommitdiff
path: root/lib/chef/mixin/deep_merge.rb
Commit message (Expand)AuthorAgeFilesLines
* Fix nil deep_merginglcg/fix-nil-deep-mergeLamont Granquist2020-09-031-12/+0
* Mark deep_merge as privateLamont Granquist2020-08-071-6/+35
* Remove copyright dateslcg/remove-copyright-datesLamont Granquist2020-04-131-1/+1
* Style/ClassCheckLamont Granquist2019-07-051-5/+5
* fix Style/PreferredHashMethodsLamont Granquist2018-07-021-1/+1
* Fix an issue where DeepMerge overwrites nil valuesDJ Mountney2017-08-101-1/+1
* fix Style/SelfAssignmentLamont Granquist2016-12-061-1/+1
* Update all auth email address from opscode.com and getchef.com to chef.io.Noah Kantrowitz2016-02-021-1/+1
* Replace all Opscode copyrights with Chef Software.Noah Kantrowitz2016-02-021-1/+1
* Copyright year update for 2016 and massive cleanup.Noah Kantrowitz2016-02-021-2/+2
* WIP: immutabilizing deep mergelcg/remove-knockout-mergeLamont Granquist2014-11-211-5/+13
* role_merge can be elmianted nowLamont Granquist2014-11-211-9/+0
* remove InvalidSubtractiveMerge classLamont Granquist2014-11-211-2/+0
* remove old knockout merge exceptionLamont Granquist2014-11-211-33/+0
* Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil"sersut/revert-attr-nil-overrideSerdar Sutay2014-11-081-6/+3
* CHEF-4101: DeepMerge - support overwriting hash values with nilMalte Swart2014-08-231-3/+6
* Use safe_dup for DeepMerge#deep_merge to avoid TypeErrordanielsdeleo2014-03-241-1/+1
* Rescue TypeError duping un-dupable types in deep mergedanielsdeleo2014-03-241-1/+7
* [CHEF-4918] Don't destructively merge subhashes in hash_only_merge!Steven Danna2014-03-191-3/+5
* CHEF-4633: fix inefficient assignment in deep mergeAvishai Ish-Shalom2013-11-061-4/+4
* Normalize whitespace on all filesSeth Vargo2013-09-261-2/+2
* add hash-only merge to deep mergedanielsdeleo2013-01-251-0/+26
* [OC-3564] move core Chef to the repo root \o/ \m/Seth Chisamore2012-10-301-0/+142
View Lorry Controller Status