Author: ecn
Date: Mon May 7 12:53:55 2012
New Revision: 1334990
URL: http://svn.apache.org/viewvc?rev=1334990&view=rev
Log:
ACCUMULO-399 merge to trunk
Added:
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/CheckBalance.java
- copied unchanged from r1334980,
accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/concurrent/CheckBalance.java
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/core/ (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1334980
Merged /accumulo/branches/1.4:r1334980
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/core:r1334980
Merged /accumulo/branches/1.4/src/core:r1334980
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/server:r1334980
Merged /accumulo/branches/1.4/src/server:r1334980
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.4/src:r1334980
Merged /accumulo/branches/1.4/src/src:r1334980
Modified: accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml?rev=1334990&r1=1334989&r2=1334990&view=diff
==============================================================================
--- accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml (original)
+++ accumulo/trunk/test/system/randomwalk/conf/modules/Concurrent.xml Mon May
7 12:53:55 2012
@@ -43,6 +43,7 @@
<edge id="ct.ChangeAuthorizations" weight="1000"/>
<edge id="ct.ChangePermissions" weight="1000"/>
<edge id="ct.CheckPermission" weight="1000"/>
+ <edge id="ct.CheckBalance" weight="1000"/>
<edge id="END" weight="1"/>
</node>
@@ -127,4 +128,8 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="ct.CheckBalance">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
</module>
