accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1209536 - in /incubator/accumulo/trunk: ./ LICENSE
Date Fri, 02 Dec 2011 15:36:20 GMT
Author: afuchs
Date: Fri Dec  2 15:36:20 2011
New Revision: 1209536

URL: http://svn.apache.org/viewvc?rev=1209536&view=rev
Log:
ACCUMULO-204

Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/LICENSE

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 15:36:20 2011
@@ -1,2 +1,2 @@
-/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
-/incubator/accumulo/branches/1.4:1201902-1209288,1209528
+/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
+/incubator/accumulo/branches/1.4:1201902-1209288,1209528,1209535

Modified: incubator/accumulo/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/LICENSE?rev=1209536&r1=1209535&r2=1209536&view=diff
==============================================================================
--- incubator/accumulo/trunk/LICENSE (original)
+++ incubator/accumulo/trunk/LICENSE Fri Dec  2 15:36:20 2011
@@ -248,8 +248,12 @@ For the src/server/src/main/resources/we
 
     The MIT License
 
-    Copyright (c) 2008, Three Dub Media (threedubmedia@gmail.com)
+    Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)  
     Copyright (c) 2009 Brandon Aaron (http://brandonaaron.net)
+    Copyright (c) 2010 "Cowboy" Ben Alman
+    Copyright 2011, John Resig
+    Copyright 2011, The Dojo Foundation
+    Copyright (c) 2007-2009 IOLA and Ole Laursen
     
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal



Mime
View raw message