incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject svn commit: r1227693 - in /incubator/accumulo/trunk/src/server: ./ src/main/java/org/apache/accumulo/server/master/Master.java
Date Thu, 05 Jan 2012 16:50:34 GMT
Author: kturner
Date: Thu Jan  5 16:50:34 2012
New Revision: 1227693

URL: http://svn.apache.org/viewvc?rev=1227693&view=rev
Log:
ACCUMULO-169 removed TODOs that are not needed (merged from 1.4)

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

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan  5 16:50:34 2012
@@ -0,0 +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-1227690

Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/Master.java?rev=1227693&r1=1227692&r2=1227693&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
(original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/Master.java
Thu Jan  5 16:50:34 2012
@@ -323,10 +323,7 @@ public class Master implements LiveTServ
 
   private void upgradeZookeeper() {
     if (Accumulo.getAccumuloPersistentVersion() == Constants.PREV_DATA_VERSION) {
-      // TODO check if tablets are loaded, if so abort?
-      
       try {
-        // TODO compare zookeeper dump of 1.3 and 1.4 zookeeper init to make sure no more
zookeeper updates are needed
         log.info("Upgrading zookeeper");
 
         IZooReaderWriter zoo = ZooReaderWriter.getInstance();



Mime
View raw message