Repository: kafka Updated Branches: refs/heads/trunk d07bb1814 -> abf6b2ebb
MINOR: Improve broker id documentation Author: Grant Henke <[email protected]> Reviewers: Ismael Juma Closes #585 from granthenke/brokerid Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/abf6b2eb Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/abf6b2eb Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/abf6b2eb Branch: refs/heads/trunk Commit: abf6b2ebb3e6e34ef9c4623b4c28dacce461c0c0 Parents: d07bb18 Author: Grant Henke <[email protected]> Authored: Wed Nov 25 17:19:00 2015 -0800 Committer: Gwen Shapira <[email protected]> Committed: Wed Nov 25 17:19:00 2015 -0800 ---------------------------------------------------------------------- core/src/main/scala/kafka/server/KafkaConfig.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/abf6b2eb/core/src/main/scala/kafka/server/KafkaConfig.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index 1d25959..32dfe42 100755 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -340,9 +340,9 @@ object KafkaConfig { val ZkEnableSecureAclsDoc = "Set client to use secure ACLs" /** ********* General Configuration ***********/ val MaxReservedBrokerIdDoc = "Max number that can be used for a broker.id" - val BrokerIdDoc = "The broker id for this server. " + - "To avoid conflicts between zookeeper generated brokerId and user's config.brokerId " + - "added MaxReservedBrokerId and zookeeper sequence starts from MaxReservedBrokerId + 1." + val BrokerIdDoc = "The broker id for this server. If unset, a unique broker id will be generated." + + "To avoid conflicts between zookeeper generated broker id's and user configured broker id's, generated broker ids" + + "start from " + MaxReservedBrokerIdProp + " + 1." val MessageMaxBytesDoc = "The maximum size of message that the server can receive" val NumNetworkThreadsDoc = "the number of network threads that the server uses for handling network requests" val NumIoThreadsDoc = "The number of io threads that the server uses for carrying out network requests"
