commit c9f930e3fe25e5675e64550c8b396356c5349ca7
author Wan Wenli <wwl.990@hotmail.com> Fri Jul 15 10:08:48 2016 -0700
committer Guozhang Wang <wangguoz@gmail.com> Fri Jul 15 10:11:29 2016 -0700
tree c8f8ef608932e9e686a8193a2a7a398f22dcf58b
parent f76013b0b3b1ae884b955202bb384d2a21b6cf48

resolve conflicts

core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala

diff --git a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
index aef8361..d4e5e24 100644
--- a/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
+++ b/core/src/main/scala/kafka/tools/VerifyConsumerRebalance.scala
@@ -114,7 +114,7 @@
           // 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