summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2012-04-11 12:35:12 -0700
committerSage Weil <sage@newdream.net>2012-04-11 12:35:12 -0700
commited0653b493a3f919a3abc37a0aa9b5aa29ae0b0e (patch)
treee6b7c387033262e0cd0603c488f7c54de6314124 /COPYING
parent6e83e1193e06b6b26cb75c8282cc8d13a94b4efb (diff)
downloadceph-ed0653b493a3f919a3abc37a0aa9b5aa29ae0b0e.tar.gz
COPYING: doc/ CC BY-SA
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING4
1 files changed, 4 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index 212187d8e4f..20ab537172d 100644
--- a/COPYING
+++ b/COPYING
@@ -2,6 +2,10 @@ Files: *
Copyright: (c) 2004-2010 by Sage Weil <sage@newdream.net>
License: LGPL2.1 (see COPYING-LGPL2.1)
+Files: doc/*
+Copyright: (c) 2010-2012 New Dream Network and contributors
+License: Creative Commons Attribution-ShareAlike (CC BY-SA)
+
Files: src/client/hadoop/ceph
Copyright: Copyright (C) New Dream Network and contributors
License: Apache License v2