You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by sr...@apache.org on 2014/02/25 09:27:18 UTC
[08/19] git commit: some more changes
some more changes
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/a4cd17a3
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/a4cd17a3
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/a4cd17a3
Branch: refs/heads/trunk
Commit: a4cd17a37bf0f5ccae7b8f6a404c8b8c0de4dbad
Parents: 09e807b
Author: Sriram Subramanian <sr...@gmail.com>
Authored: Tue Nov 19 17:15:01 2013 -0800
Committer: Sriram Subramanian <sr...@gmail.com>
Committed: Tue Nov 19 17:15:01 2013 -0800
----------------------------------------------------------------------
core/src/main/scala/kafka/admin/AdminUtils.scala | 4 ----
core/src/main/scala/kafka/controller/KafkaController.scala | 7 +------
2 files changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/a4cd17a3/core/src/main/scala/kafka/admin/AdminUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/admin/AdminUtils.scala b/core/src/main/scala/kafka/admin/AdminUtils.scala
index 05fb5b5..8ff4bd5 100644
--- a/core/src/main/scala/kafka/admin/AdminUtils.scala
+++ b/core/src/main/scala/kafka/admin/AdminUtils.scala
@@ -33,10 +33,6 @@ import scala.Predef._
import collection.Map
import scala.Some
import collection.Set
-<<<<<<< HEAD
-import kafka.common.TopicAndPartition
-=======
->>>>>>> eedbea6526986783257ad0e025c451a8ee3d9095
object AdminUtils extends Logging {
val rand = new Random
http://git-wip-us.apache.org/repos/asf/kafka/blob/a4cd17a3/core/src/main/scala/kafka/controller/KafkaController.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/controller/KafkaController.scala b/core/src/main/scala/kafka/controller/KafkaController.scala
index d9d47c8..476ed86 100644
--- a/core/src/main/scala/kafka/controller/KafkaController.scala
+++ b/core/src/main/scala/kafka/controller/KafkaController.scala
@@ -28,7 +28,7 @@ import kafka.common._
import kafka.metrics.{KafkaTimer, KafkaMetricsGroup}
import kafka.server.{ZookeeperLeaderElector, KafkaConfig}
import kafka.utils.ZkUtils._
-import kafka.utils._
+import kafka.utils.{Json, Utils, ZkUtils, Logging, KafkaScheduler}
import org.apache.zookeeper.Watcher.Event.KeeperState
import org.I0Itec.zkclient.{IZkDataListener, IZkStateListener, ZkClient}
import org.I0Itec.zkclient.exception.{ZkNodeExistsException, ZkNoNodeException}
@@ -36,11 +36,6 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.Some
import kafka.common.TopicAndPartition
import org.apache.log4j.Logger
-import scala.Some
-import kafka.common.TopicAndPartition
-import kafka.controller.ReassignedPartitionsContext
-import kafka.controller.PartitionAndReplica
-import kafka.controller.LeaderIsrAndControllerEpoch
class ControllerContext(val zkClient: ZkClient,
val zkSessionTimeout: Int,