----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/19696/#review38648 -----------------------------------------------------------
Tim, I get the following conflict when I try to apply this patch to the 0.8.1 branch - nnarkhed-mn1:kafka-git-idea nnarkhed$ patch -p1 -i ~/Projects/kafka-patches/kafka-1317-march26.patch patching file core/src/main/scala/kafka/controller/KafkaController.scala Hunk #1 succeeded at 38 (offset -2 lines). Hunk #2 FAILED at 646. 1 out of 2 hunks FAILED -- saving rejects to file core/src/main/scala/kafka/controller/KafkaController.scala.rej patching file core/src/main/scala/kafka/controller/TopicDeletionManager.scala patching file core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala - Neha Narkhede On March 26, 2014, 6:59 p.m., Timothy Chen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/19696/ > ----------------------------------------------------------- > > (Updated March 26, 2014, 6:59 p.m.) > > > Review request for kafka. > > > Bugs: KAFKA-1317 > https://issues.apache.org/jira/browse/KAFKA-1317 > > > Repository: kafka > > > Description > ------- > > KAFKA-1317 Fix Kafka shutdown with delete topic on > This is based off of origin/trunk > > > Diffs > ----- > > core/src/main/scala/kafka/controller/KafkaController.scala > 7dc27186dec23eccef934b0a1af9f320553e6c7c > core/src/main/scala/kafka/controller/TopicDeletionManager.scala > 488dfd08d9956dab2fb1ed3925d138cda637509d > core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala > 20fe93e623319fd82236eb6364d7f80bf7a256aa > > Diff: https://reviews.apache.org/r/19696/diff/ > > > Testing > ------- > > > Thanks, > > Timothy Chen > >
