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/11/21 20:56:36 UTC

svn commit: r1204672 - /incubator/accumulo/trunk/

Author: afuchs
Date: Mon Nov 21 19:56:36 2011
New Revision: 1204672

URL: http://svn.apache.org/viewvc?rev=1204672&view=rev
Log:
ACCUMULO-166 merge from 1.4 branch

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

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 21 19:56:36 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
-/incubator/accumulo/branches/1.4:1201902-1204634
+/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
+/incubator/accumulo/branches/1.4:1201902-1204669