svn commit: r747224 - in /hadoop/zookeeper/branches/branch-3.1: CHANGES.txt src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java

[mahadev]

Author: mahadev
Date: Mon Feb 23 23:55:41 2009
New Revision: 747224

URL: http://svn.apache.org/viewvc?rev=747224&view=rev
Log:
ZOOKEEPER-326. standalone server ignores tickTime configuration (chris darroch 
via mahadev)

Modified:
    hadoop/zookeeper/branches/branch-3.1/CHANGES.txt
    
hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java

Modified: hadoop/zookeeper/branches/branch-3.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/CHANGES.txt?rev=747224&r1=747223&r2=747224&view=diff
==============================================================================
--- hadoop/zookeeper/branches/branch-3.1/CHANGES.txt (original)
+++ hadoop/zookeeper/branches/branch-3.1/CHANGES.txt Mon Feb 23 23:55:41 2009
@@ -1,3 +1,20 @@
+Fix release
+
+Non-backward compatible changes:
+
+BUGFIXES:
+
+Backward compatibile changes:
+
+BUGFIXES:
+  
+  ZOOKEEPER-326. standalone server ignores tickTime configuration (chris
+darroch via mahadev)
+
+IMPROVEMENTS:
+
+NEW FEATURES:
+
 Release 3.1.0 - 2009-02-11
   
 Non-backward compatible changes:

Modified: 
hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
URL: 
http://svn.apache.org/viewvc/hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java?rev=747224&r1=747223&r2=747224&view=diff
==============================================================================
--- 
hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
 (original)
+++ 
hadoop/zookeeper/branches/branch-3.1/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
 Mon Feb 23 23:55:41 2009
@@ -26,6 +26,7 @@
 import org.apache.log4j.Logger;
 import org.apache.zookeeper.jmx.ManagedUtil;
 import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
+import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 
 /**
  * This class starts and runs a standalone ZooKeeperServer.
@@ -47,7 +48,7 @@
         }
 
         try {
-            ServerConfig.parse(args);
+            QuorumPeerConfig.parse(args);
         } catch(Exception e) {
             LOG.fatal("Error in config", e);
             LOG.info(USAGE);
@@ -66,6 +67,7 @@
                        File(ServerConfig.getDataLogDir()),
                         new File(ServerConfig.getDataDir()));
                zks.setTxnLogFactory(ftxn);
+               zks.setTickTime(QuorumPeerConfig.getTickTime());
                return zks;
             }
         });