]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
hadoop: apache license.
authorGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 1 Dec 2011 19:14:34 +0000 (11:14 -0800)
committerGreg Farnum <gregory.farnum@dreamhost.com>
Thu, 1 Dec 2011 19:15:29 +0000 (11:15 -0800)
We haven't made explicit that the Hadoop Java code is under the Apache
License. Do so (with permission from the other contributors, thanks!).

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
debian/copyright
src/client/hadoop/ceph/LICENSE [new file with mode: 0644]

index 33a936e351481d89d8cfaa29a08ec13dae733ea2..1c704dec7b355a75c77862f6f1103a238ce8c063 100644 (file)
@@ -7,6 +7,10 @@ Files: *
 Copyright: (c) 2004-2010 by Sage Weil <sage@newdream.net>
 License: LGPL2.1 (see /usr/share/common-licenses/LGPL-2.1)
 
+Files: src/client/hadoop/ceph
+Copyright: Copyright (C) New Dream Network and contributors
+License: Apache License v2
+
 Files: src/rbd.cc
 Copyright:
     Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
diff --git a/src/client/hadoop/ceph/LICENSE b/src/client/hadoop/ceph/LICENSE
new file mode 100644 (file)
index 0000000..7a0decd
--- /dev/null
@@ -0,0 +1,4 @@
+Unlike the rest of the code in this repository, this
+directory (src/client/hadoop) is licensed under the Apache License 2.0. This
+is for the obvious reason that we want to integrate it into the Apache Hadoop
+project.
\ No newline at end of file