You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2012/01/06 19:34:55 UTC
svn commit: r1228331 - in /incubator/accumulo/branches/1.4: ./
src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Author: ecn
Date: Fri Jan 6 18:34:54 2012
New Revision: 1228331
URL: http://svn.apache.org/viewvc?rev=1228331&view=rev
Log:
ACCUMULO-214 merge fix to 1.4 branch
Modified:
incubator/accumulo/branches/1.4/ (props changed)
incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Propchange: incubator/accumulo/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 6 18:34:54 2012
@@ -1,4 +1,4 @@
/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,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195
/incubator/accumulo/branches/1.3.5rc:1209938
/incubator/accumulo/branches/1.4:1205476
-/incubator/accumulo/trunk:1205476,1205570,1208726,1222413,1222719,1222733-1222734
+/incubator/accumulo/trunk:1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734
Modified: incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1228331&r1=1228330&r2=1228331&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java (original)
+++ incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/Master.java Fri Jan 6 18:34:54 2012
@@ -440,7 +440,7 @@ public class Master implements LiveTServ
int result = 0;
for (TabletGroupWatcher watcher : watchers) {
for (TableCounts counts : watcher.getStats().values()) {
- result += counts.assigned() + counts.unassigned() + counts.assignedToDeadServers();
+ result += counts.assigned() + counts.assignedToDeadServers();
}
}
return result;