svn commit: r1412061 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java

[ivank]

Author: ivank
Date: Wed Nov 21 11:24:30 2012
New Revision: 1412061

URL: http://svn.apache.org/viewvc?rev=1412061&view=rev
Log:
BOOKKEEPER-466: ZooKeeper test utility sets the port number as the tickTime 
(ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1412061&r1=1412060&r2=1412061&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Nov 21 11:24:30 2012
@@ -104,6 +104,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-430: Remove manual bookie registration from overview (fpj 
via ivank)
 
+        BOOKKEEPER-466: ZooKeeper test utility sets the port number as the 
tickTime (ivank)
+
       hedwig-protocol:
 
         BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via 
sijie)

Modified: 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
URL: 
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java?rev=1412061&r1=1412060&r2=1412061&view=diff
==============================================================================
--- 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
 (original)
+++ 
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ZooKeeperUtil.java
 Wed Nov 21 11:24:30 2012
@@ -80,7 +80,8 @@ public class ZooKeeperUtil {
         ZkTmpDir.delete();
         ZkTmpDir.mkdir();
 
-        zks = new ZooKeeperServer(ZkTmpDir, ZkTmpDir, ZooKeeperDefaultPort);
+        zks = new ZooKeeperServer(ZkTmpDir, ZkTmpDir,
+                                  ZooKeeperServer.DEFAULT_TICK_TIME);
         serverFactory = new NIOServerCnxnFactory();
         serverFactory.configure(zkaddr, 100);
         serverFactory.startup(zks);
@@ -143,4 +144,4 @@ public class ZooKeeperUtil {
         // ServerStats.unregister();
         FileUtils.deleteDirectory(ZkTmpDir);
     }
-}
\ No newline at end of file
+}