Repository: kafka-site Updated Branches: refs/heads/asf-site 1a18a4561 -> de1086740
Fix table of contents and minor fix in `block.on.buffer.full` doc Project: http://git-wip-us.apache.org/repos/asf/kafka-site/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka-site/commit/de108674 Tree: http://git-wip-us.apache.org/repos/asf/kafka-site/tree/de108674 Diff: http://git-wip-us.apache.org/repos/asf/kafka-site/diff/de108674 Branch: refs/heads/asf-site Commit: de10867406730b6b26b7e5f616547c530a144771 Parents: 1a18a45 Author: Ismael Juma <[email protected]> Authored: Tue May 24 12:18:16 2016 +0100 Committer: Ismael Juma <[email protected]> Committed: Tue May 24 12:18:16 2016 +0100 ---------------------------------------------------------------------- 0100/documentation.html | 3 ++- 0100/generated/producer_config.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka-site/blob/de108674/0100/documentation.html ---------------------------------------------------------------------- diff --git a/0100/documentation.html b/0100/documentation.html index ddc3102..31dc039 100644 --- a/0100/documentation.html +++ b/0100/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> http://git-wip-us.apache.org/repos/asf/kafka-site/blob/de108674/0100/generated/producer_config.html ---------------------------------------------------------------------- diff --git a/0100/generated/producer_config.html b/0100/generated/producer_config.html index 665cf15..d8b4e63 100644 --- a/0100/generated/producer_config.html +++ b/0100/generated/producer_config.html @@ -70,7 +70,7 @@ <tr> <td>timeout.ms</td><td>The configuration controls the maximum amount of time the server will wait for acknowledgments from followers to meet the acknowledgment requirements the producer has specified with the <code>acks</code> configuration. If the requested number of acknowledgments are not met when the timeout elapses an error will be returned. This timeout is measured on the server side and does not include the network latency of the request.</td><td>int</td><td>30000</td><td>[0,...]</td><td>medium</td></tr> <tr> -<td>block.on.buffer.full</td><td>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</code> to Long.MAX_VALUE.<em>Also if this property is set to true, parameter <code>metadata.fetch.timeout.ms</code> is not longer honored.</em><p>This parameter is deprecated and will be removed in a future release. Parameter <code>max.block.ms</code> should be used instead.</td><td>boolean</td><td>false</td><td></td><td>low</td></tr> +<td>block.on.buffer.full</td><td>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 <code>max.block.ms</code> value to block, after which it will throw a TimeoutException. Setting this property to true will set the <code>max.block.ms</code> to Long.MAX_VALUE. <em>Also if this property is set to true, parameter <code>metadata.fetch.timeout.ms</code> is not longer honored.</em><p>This parameter is deprecated and will be removed in a future release. Parameter <code>max.block.ms</code> should be used instead.</td><td>boolean</td><td>false</td><td></td><td>low</td></tr> <tr> <td>interceptor.classes</td><td>A list of classes to use as interceptors. Implementing the <code>ProducerInterceptor</code> interface allows you to intercept (and possibly mutate) the records received by the producer before they are published to the Kafka cluster. By default, there are no interceptors.</td><td>list</td><td>null</td><td></td><td>low</td></tr> <tr>
