summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jacob <adam@hjksolutions.com>2009-01-08 15:48:58 -0800
committerAdam Jacob <adam@hjksolutions.com>2009-01-08 15:48:58 -0800
commit7235ace11777587f18fa77e2ecc543614bb3fce0 (patch)
tree02353572f1cb54caedd0e9b513198cab61e48fbd
parent14a6210af5947c5e6a1c620911ea2537d72c6e20 (diff)
downloadchef-7235ace11777587f18fa77e2ecc543614bb3fce0.tar.gz
Updating notice file for Merb
-rw-r--r--NOTICE4
1 files changed, 3 insertions, 1 deletions
diff --git a/NOTICE b/NOTICE
index 48b3e8440c..98d9cf3a76 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,7 +1,7 @@
Chef NOTICE
===========
-Developed at HJK Solutions (http://www.hjksolutions.com).
+Developed at Opscode (http://www.opscode.com).
Contributors and Copyright holders:
@@ -11,3 +11,5 @@ Contributors and Copyright holders:
* Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
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.