You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/12/05 20:04:39 UTC
svn commit: r1210577 - in /incubator/accumulo/branches/1.4: ./ NOTICE
Author: ecn
Date: Mon Dec 5 19:04:39 2011
New Revision: 1210577
URL: http://svn.apache.org/viewvc?rev=1210577&view=rev
Log:
ACCUMULO-86 fix up the LICENSE and NOTICE files
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/NOTICE
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 5 19:04:39 2011
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210571
/incubator/accumulo/branches/1.4:1205476
/incubator/accumulo/trunk:1205476,1205570,1208726
Modified: incubator/accumulo/branches/1.4/NOTICE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/NOTICE?rev=1210577&r1=1210576&r2=1210577&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/NOTICE (original)
+++ incubator/accumulo/branches/1.4/NOTICE Mon Dec 5 19:04:39 2011
@@ -12,3 +12,9 @@ This product includes JLine (http://jlin
under the BSD License.
Copyright (c) 2002-2006, Marc Prud'hommeaux <mw...@cornell.edu>, All rights
reserved.
+
+Files in src/core/src/main/java/org/apache/accumulo/core/bloomfilter
+derived from sources
+Copyright (c) 2005, European Commission project OneLab under contract
+034819 (http://www.one-lab.org)
+All rights reserved.