clhm licensing/attribution that match current practice

Patch by eevans; reviewed by jbellis for CASSANDRA-528 git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@833222 13f79535-47bb-0310-9956-ffa450edef68
binlijin · Nov 5, 2009 · 0be4eb0 · 0be4eb0
1 parent 23dd572
commit 0be4eb0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 203 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -209,7 +209,8 @@ dependencies that have separate copyright notices and license terms. Your
 use of these libraries is subject to the terms and conditions of the 
 following licenses.
 
-For lib/flexjson-1.7.jar and lib/google-collect-1.0-rc1.jar:
+For lib/flexjson-1.7.jar, lib/google-collect-1.0-rc1.jar, and
+lib/clhm-production.jar:
 
 While developed outside the ASF, these projects are also licensed under
 the Apache License 2.0. The full text of the Apache License 2.0 can be

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -25,3 +25,7 @@ This product makes use of the JUnit test framework (http://junit.org).
 
 Logging abstraction provided by SLF4J (http://www.slf4j.org).
 Copyright (c) 2004-2008 QOS.ch
+
+Some alternate data structures provided by concurrentlinkedhashmap
+from http://code.google.com/p/concurrentlinkedhashmap/.
+Copyright 2009 Benjamin Manes
diff --git a/lib/licenses/clhm-production.jar.LICENSE b/lib/licenses/clhm-production.jar.LICENSE