You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by af...@apache.org on 2011/12/02 16:34:57 UTC

svn commit: r1209534 - in /incubator/accumulo/branches/1.3.5rc: ./ LICENSE

Author: afuchs
Date: Fri Dec  2 15:34:56 2011
New Revision: 1209534

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

Modified:
    incubator/accumulo/branches/1.3.5rc/   (props changed)
    incubator/accumulo/branches/1.3.5rc/LICENSE

Propchange: incubator/accumulo/branches/1.3.5rc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 15:34:56 2011
@@ -1 +1 @@
-/incubator/accumulo/branches/1.3:1209526
+/incubator/accumulo/branches/1.3:1209526,1209532

Modified: incubator/accumulo/branches/1.3.5rc/LICENSE
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3.5rc/LICENSE?rev=1209534&r1=1209533&r2=1209534&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3.5rc/LICENSE (original)
+++ incubator/accumulo/branches/1.3.5rc/LICENSE Fri Dec  2 15:34:56 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