fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/09e807bd Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/09e807bd Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/09e807bd Branch: refs/heads/trunk Commit: 09e807bda103fe632e62312f036b850a59576f36 Parents: 5bcb418 Author: Sriram Subramanian <[email protected]> Authored: Tue Nov 19 17:07:43 2013 -0800 Committer: Sriram Subramanian <[email protected]> Committed: Tue Nov 19 17:07:43 2013 -0800 ---------------------------------------------------------------------- core/src/main/scala/kafka/admin/TopicCommand.scala | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/09e807bd/core/src/main/scala/kafka/admin/TopicCommand.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/admin/TopicCommand.scala b/core/src/main/scala/kafka/admin/TopicCommand.scala index c3eecdd..3c08dee 100644 --- a/core/src/main/scala/kafka/admin/TopicCommand.scala +++ b/core/src/main/scala/kafka/admin/TopicCommand.scala @@ -79,10 +79,6 @@ object TopicCommand { def alterTopic(zkClient: ZkClient, opts: TopicCommandOptions) { CommandLineUtils.checkRequiredArgs(opts.parser, opts.options, opts.topicOpt) val topic = opts.options.valueOf(opts.topicOpt) -<<<<<<< HEAD - if(opts.options.has(opts.configOpt)) { - val configs = parseTopicConfigs(opts) -======= if(opts.options.has(opts.configOpt) || opts.options.has(opts.deleteConfigOpt)) { val configsToBeAdded = parseTopicConfigsToBeAdded(opts) val configsToBeDeleted = parseTopicConfigsToBeDeleted(opts) @@ -90,7 +86,6 @@ object TopicCommand { val configs = AdminUtils.fetchTopicConfig(zkClient, topic) configs.putAll(configsToBeAdded) configsToBeDeleted.foreach(config => configs.remove(config)) ->>>>>>> eedbea6526986783257ad0e025c451a8ee3d9095 AdminUtils.changeTopicConfig(zkClient, topic, configs) println("Updated config for topic \"%s\".".format(topic)) } @@ -212,13 +207,10 @@ object TopicCommand { .withRequiredArg .describedAs("name=value") .ofType(classOf[String]) -<<<<<<< HEAD -======= val deleteConfigOpt = parser.accepts("deleteConfig", "A topic configuration override to be removed for an existing topic") .withRequiredArg .describedAs("name") .ofType(classOf[String]) ->>>>>>> eedbea6526986783257ad0e025c451a8ee3d9095 val partitionsOpt = parser.accepts("partitions", "The number of partitions for the topic being created or " + "altered (WARNING: If partitions are increased for a topic that has a key, the partition logic or ordering of the messages will be affected") .withRequiredArg
