delta/ruby-gems/chef.git - github.com: opscode/chef.git

	Commit message (Expand)	Author	Age	Files	Lines
*	WIP: immutabilizing deep mergelcg/remove-knockout-merge	Lamont Granquist	2014-11-21	1	-5/+13
*	role_merge can be elmianted now	Lamont Granquist	2014-11-21	1	-9/+0
*	remove InvalidSubtractiveMerge class	Lamont Granquist	2014-11-21	1	-2/+0
*	remove old knockout merge exception	Lamont Granquist	2014-11-21	1	-33/+0
*	Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil"sersut/revert-attr-nil-override	Serdar Sutay	2014-11-08	1	-6/+3
*	CHEF-4101: DeepMerge - support overwriting hash values with nil	Malte Swart	2014-08-23	1	-3/+6
*	Use safe_dup for DeepMerge#deep_merge to avoid TypeError	danielsdeleo	2014-03-24	1	-1/+1
*	Rescue TypeError duping un-dupable types in deep merge	danielsdeleo	2014-03-24	1	-1/+7
*	[CHEF-4918] Don't destructively merge subhashes in hash_only_merge!	Steven Danna	2014-03-19	1	-3/+5
*	CHEF-4633: fix inefficient assignment in deep merge	Avishai Ish-Shalom	2013-11-06	1	-4/+4
*	Normalize whitespace on all files	Seth Vargo	2013-09-26	1	-2/+2
*	add hash-only merge to deep merge	danielsdeleo	2013-01-25	1	-0/+26
*	[OC-3564] move core Chef to the repo root \o/ \m/	Seth Chisamore	2012-10-30	1	-0/+142