incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1294289 - in /incubator/accumulo/trunk/src/server: ./ src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
Date Mon, 27 Feb 2012 19:22:27 GMT
Author: vines
Date: Mon Feb 27 19:22:26 2012
New Revision: 1294289

URL: http://svn.apache.org/viewvc?rev=1294289&view=rev
Log:
Merging ACCUMULO-426


Added:
    incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
      - copied unchanged from r1294288, incubator/accumulo/branches/1.4/src/server/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
    incubator/accumulo/trunk/src/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
      - copied unchanged from r1294288, incubator/accumulo/branches/1.4/src/server/src/test/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancerTest.java
Modified:
    incubator/accumulo/trunk/src/server/   (props changed)

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 27 19:22:26 2012
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3.5rc/src/server:1209938
 /incubator/accumulo/branches/1.3/src/server: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
-/incubator/accumulo/branches/1.4/src/server:1201902-1293435
+/incubator/accumulo/branches/1.3.5rc/src/server:1209938
+/incubator/accumulo/branches/1.4/src/server:1201902-1294288



Mime
View raw message