Justin Burnham c12e9afc97 PUP-1724 Don't modify the paramaters to deep_merge ... Instead of modifying the first paramater of deep_merge due to the use of the merge! function, instead use merge to return a copy of the merged object. This allows one to continue to use the original first parameter after the call to deep_merge.		2014-02-17 12:19:40 -08:00
..
classes	Add behavior example for anchor refresh propagation	2013-04-11 17:55:40 -07:00
fixtures/dscacheutil	(PUP-1459) Add support for root_home on OS X 10.9	2014-01-22 22:54:34 -08:00
functions	(maint) Update ensure_package specs to confirm expected behavior	2014-01-15 11:04:03 -08:00
monkey_patches	puppet-lint cleanup	2012-11-15 10:38:03 -06:00
unit	PUP-1724 Don't modify the paramaters to deep_merge	2014-02-17 12:19:40 -08:00
spec.opts	Copied function test scaffolding from puppet.	2011-06-29 12:25:43 +01:00
spec_helper.rb	Revert "Revert "Merge branch '2.5.x' into 3.0.x""	2012-10-25 15:44:14 -07:00
watchr.rb	(Maint) Add watchr autotest script	2011-10-10 12:03:57 -07:00