Repository: kafka Updated Branches: refs/heads/trunk fe27d8f78 -> 5f498855d
MINOR: Fix documentation table of contents and `BLOCK_ON_BUFFER_FULL_DOC` Author: Ismael Juma <[email protected]> Reviewers: Gwen Shapira Closes #1423 from ijuma/minor-doc-fixes Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/5f498855 Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/5f498855 Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/5f498855 Branch: refs/heads/trunk Commit: 5f498855d9e247b07af54c6329b5b5347e469ace Parents: fe27d8f Author: Ismael Juma <[email protected]> Authored: Tue May 24 12:53:24 2016 -0700 Committer: Gwen Shapira <[email protected]> Committed: Tue May 24 12:53:24 2016 -0700 ---------------------------------------------------------------------- .../org/apache/kafka/clients/producer/ProducerConfig.java | 7 +++---- docs/documentation.html | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/5f498855/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java ---------------------------------------------------------------------- diff --git a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java index 4ed083b..4d121b9 100644 --- a/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java +++ b/clients/src/main/java/org/apache/kafka/clients/producer/ProducerConfig.java @@ -144,11 +144,10 @@ public class ProducerConfig extends AbstractConfig { @Deprecated public static final String BLOCK_ON_BUFFER_FULL_CONFIG = "block.on.buffer.full"; private static final String BLOCK_ON_BUFFER_FULL_DOC = "When our memory buffer is exhausted we must either stop accepting new records (block) or throw errors. " - + "By default this setting is false and the producer will no longer throw a BufferExhaustException but instead will use the {@link #MAX_BLOCK_MS_CONFIG} " - + "value to block, after which it will throw a TimeoutException. Setting this property to true will set the <code>" + MAX_BLOCK_MS_CONFIG + "</code> to Long.MAX_VALUE." + + "By default this setting is false and the producer will no longer throw a BufferExhaustException but instead will use the <code>" + MAX_BLOCK_MS_CONFIG + "</code> " + + "value to block, after which it will throw a TimeoutException. Setting this property to true will set the <code>" + MAX_BLOCK_MS_CONFIG + "</code> to Long.MAX_VALUE. " + "<em>Also if this property is set to true, parameter <code>" + METADATA_FETCH_TIMEOUT_CONFIG + "</code> is not longer honored.</em>" - + "<p>" - + "This parameter is deprecated and will be removed in a future release. " + + "<p>This parameter is deprecated and will be removed in a future release. " + "Parameter <code>" + MAX_BLOCK_MS_CONFIG + "</code> should be used instead."; /** <code>buffer.memory</code> */ http://git-wip-us.apache.org/repos/asf/kafka/blob/5f498855/docs/documentation.html ---------------------------------------------------------------------- diff --git a/docs/documentation.html b/docs/documentation.html index ddc3102..31dc039 100644 --- a/docs/documentation.html +++ b/docs/documentation.html @@ -123,7 +123,8 @@ Prior releases: <a href="/07/documentation.html">0.7.x</a>, <a href="/08/documen <li><a href="#security_ssl">7.2 Encryption and Authentication using SSL</a></li> <li><a href="#security_sasl">7.3 Authentication using SASL</a></li> <li><a href="#security_authz">7.4 Authorization and ACLs</a></li> - <li><a href="#zk_authz">7.5 ZooKeeper Authentication</a></li> + <li><a href="#security_rolling_upgrade">7.5 Incorporating Security Features in a Running Cluster</a></li> + <li><a href="#zk_authz">7.6 ZooKeeper Authentication</a></li> <ul> <li><a href="#zk_authz_new">New Clusters</a></li> <li><a href="#zk_authz_migration">Migrating Clusters</a></li>
