From c9f930e3fe25e5675e64550c8b396356c5349ca7 Mon Sep 17 00:00:00 2001
From: Wan Wenli <wwl.990@hotmail.com>
Date: Fri, 15 Jul 2016 10:08:48 -0700
Subject: [PATCH] resolve conflicts

---
 core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
index aef8361b73a..d4e5e248248 100644
--- a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
+++ b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
@@ -114,7 +114,7 @@ object VerifyConsumerRebalance extends Logging {
           // check if the owner is a valid consumer id
           consumerIdsForTopic match {
             case Some(consumerIds) =>
-              if(!consumerIds.contains(partitionOwner)) {
+              if(!consumerIds.map(c => c.toString).contains(partitionOwner)) {
                 error(("Owner %s for partition [%s,%d] is not a valid member of consumer " +
                   "group %s").format(partitionOwner, topic, partition, group))
                 rebalanceSucceeded = false