svn commit: r1330273 - in /accumulo/trunk: ./ core/ server/ server/src/main/java/org/apache/accumulo/server/master/Master.java

[ecn]

Author: ecn
Date: Wed Apr 25 13:24:25 2012
New Revision: 1330273

URL: http://svn.apache.org/viewvc?rev=1330273&view=rev
Log:
ACCUMULO-520: merge to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/server/   (props changed)
    
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/src:r1330267
  Merged /accumulo/branches/1.3:r1330264
  Merged /accumulo/branches/1.4:r1330267

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/src/core:r1330264
  Merged /accumulo/branches/1.4/core:r1330267
  Merged /accumulo/branches/1.4/src/core:r1330267

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.4/server:r1330267
  Merged /accumulo/branches/1.3/src/server:r1330264
  Merged /accumulo/branches/1.4/src/server:r1330267

Modified: 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1330273&r1=1330272&r2=1330273&view=diff
==============================================================================
--- 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
 (original)
+++ 
accumulo/trunk/server/src/main/java/org/apache/accumulo/server/master/Master.java
 Wed Apr 25 13:24:25 2012
@@ -423,7 +423,7 @@ public class Master implements LiveTServ
             TableCounts counts = entry.getValue();
             TableState tableState = manager.getTableState(tableId.toString());
             if (tableState != null && tableState.equals(TableState.ONLINE)) {
-              result += counts.unassigned() + counts.assignedToDeadServers();
+              result += counts.unassigned() + counts.assignedToDeadServers() + 
counts.assigned();
             }
           }
         }