opscode/chef — pull request #2477 by sersut (2014-11-24 04:44:55+00:00)
Title: Merge pull request #2462 from opscode/lcg/remove-knockout-merge

Remove old knockout merge exception

Conflicts:
spec/unit/mixin/deep_merge_spec.rb