kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jjko...@apache.org
Subject [37/37] git commit: KAFKA-1485 Upgrade to Zookeeper 3.4.6 patch by Gwen Shapira reviewed by Joe Stein
Date Tue, 05 Aug 2014 23:00:34 GMT
KAFKA-1485 Upgrade to Zookeeper 3.4.6 patch by Gwen Shapira reviewed by Joe Stein


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7a67a722
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7a67a722
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7a67a722

Branch: refs/heads/transactional_messaging
Commit: 7a67a72261bcb5b09d9defb2fd95a65c89e75172
Parents: 09690e3
Author: vagrant <vagrant@precise64.(none)>
Authored: Tue Aug 5 22:24:03 2014 +0000
Committer: vagrant <vagrant@precise64.(none)>
Committed: Tue Aug 5 22:24:03 2014 +0000

----------------------------------------------------------------------
 build.gradle                                              | 2 +-
 core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/7a67a722/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a72905d..9cbedb8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -215,7 +215,7 @@ project(':core') {
   dependencies {
     compile project(':clients')
     compile "org.scala-lang:scala-library:$scalaVersion"
-    compile 'org.apache.zookeeper:zookeeper:3.3.4'
+    compile 'org.apache.zookeeper:zookeeper:3.4.6'
     compile 'com.101tec:zkclient:0.3'
     compile 'com.yammer.metrics:metrics-core:2.2.0'
     compile 'net.sf.jopt-simple:jopt-simple:3.2'

http://git-wip-us.apache.org/repos/asf/kafka/blob/7a67a722/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala
index d883bde..3021a8c 100644
--- a/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala
+++ b/core/src/test/scala/unit/kafka/zk/EmbeddedZookeeper.scala
@@ -19,6 +19,7 @@ package kafka.zk
 
 import org.apache.zookeeper.server.ZooKeeperServer
 import org.apache.zookeeper.server.NIOServerCnxn
+import org.apache.zookeeper.server.NIOServerCnxnFactory
 import kafka.utils.TestUtils
 import java.net.InetSocketAddress
 import kafka.utils.Utils
@@ -29,7 +30,8 @@ class EmbeddedZookeeper(val connectString: String) {
   val tickTime = 500
   val zookeeper = new ZooKeeperServer(snapshotDir, logDir, tickTime)
   val port = connectString.split(":")(1).toInt
-  val factory = new NIOServerCnxn.Factory(new InetSocketAddress("127.0.0.1", port))
+  val factory = new NIOServerCnxnFactory()
+  factory.configure(new InetSocketAddress("127.0.0.1", port),0)
   factory.startup(zookeeper)
 
   def shutdown() {


Mime
View raw message