summaryrefslogtreecommitdiff
path: root/NOTICE
diff options
context:
space:
mode:
authorDaniel DeLeo <dan@opscode.com>2010-02-08 14:29:16 -0800
committerDaniel DeLeo <dan@opscode.com>2010-02-08 14:29:16 -0800
commit5f67e8c252baed0a08f31d1192e0c0d023db1951 (patch)
tree5ba89646a5c2a17f1562f8654e38c631beccfe23 /NOTICE
parent97af179dc7dabb0a3929d7c354128b9b02592957 (diff)
downloadchef-5f67e8c252baed0a08f31d1192e0c0d023db1951.tar.gz
attribute deep_merge to Steve Midgley in NOTICE
Diffstat (limited to 'NOTICE')
-rw-r--r--NOTICE2
1 files changed, 2 insertions, 0 deletions
diff --git a/NOTICE b/NOTICE
index bc32c15088..04c07d8309 100644
--- a/NOTICE
+++ b/NOTICE
@@ -17,3 +17,5 @@ Contributors and Copyright holders:
Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.
Chef incorporates code modified from Merb (http://www.merbivore.com), which is Copyright (c) 2008 Engine Yard.
+
+Chef incorporates code modified from deep_merge (http://trac.misuse.org/science/wiki/DeepMerge), which is Copyright (c) 2008 Steve Midgley