Repository: kafka Updated Branches: refs/heads/trunk 6ab9b1ecd -> 993e1aac8
KAFKA-1276 Make topic command list the possible topic-level configs that are available. Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/993e1aac Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/993e1aac Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/993e1aac Branch: refs/heads/trunk Commit: 993e1aac8f351b9ea5c322c568505d795f6d664a Parents: 6ab9b1e Author: Jay Kreps <[email protected]> Authored: Thu Feb 20 21:34:10 2014 -0800 Committer: Jay Kreps <[email protected]> Committed: Fri Feb 21 10:56:42 2014 -0800 ---------------------------------------------------------------------- core/src/main/scala/kafka/admin/TopicCommand.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/993e1aac/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 fc8d686..dc9b092 100644 --- a/core/src/main/scala/kafka/admin/TopicCommand.scala +++ b/core/src/main/scala/kafka/admin/TopicCommand.scala @@ -224,11 +224,14 @@ object TopicCommand { .withRequiredArg .describedAs("topic") .ofType(classOf[String]) - val configOpt = parser.accepts("config", "A topic configuration override for the topic being created or altered.") + val nl = System.getProperty("line.separator") + val configOpt = parser.accepts("config", "A topic configuration override for the topic being created or altered." + + "The following is a list of valid configurations: " + nl + LogConfig.ConfigNames.map("\t" + _).mkString(nl) + nl + + "See the Kafka documentation for full details on the topic configs.") .withRequiredArg .describedAs("name=value") .ofType(classOf[String]) - val deleteConfigOpt = parser.accepts("deleteConfig", "A topic configuration override to be removed for an existing topic") + val deleteConfigOpt = parser.accepts("delete-config", "A topic configuration override to be removed for an existing topic (see the list of configurations under the --config option).") .withRequiredArg .describedAs("name") .ofType(classOf[String])
