Merge branch 'tp31' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/be5b64a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/be5b64a5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/be5b64a5 Branch: refs/heads/TINKERPOP-1545-tp32 Commit: be5b64a5c089a6b2c3a98bdc062438cde8096a73 Parents: 2f68d7e a27a048 Author: Robert Dale <robd...@gmail.com> Authored: Mon Jan 9 09:17:10 2017 -0500 Committer: Robert Dale <robd...@gmail.com> Committed: Mon Jan 9 09:17:10 2017 -0500 ---------------------------------------------------------------------- docs/src/reference/gremlin-applications.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/be5b64a5/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/reference/gremlin-applications.asciidoc index 53b1dfd,1a2398d..e515ef7 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@@ -687,10 -613,9 +687,10 @@@ The following table describes the vario |Key |Description |Default |connectionPool.channelizer |The fully qualified classname of the client `Channelizer` that defines how to connect to the server. |`Channelizer.WebSocketChannelizer` |connectionPool.enableSsl |Determines if SSL should be enabled or not. If enabled on the server then it must be enabled on the client. |false +|connectionPool.keepAliveInterval |Length of time in milliseconds to wait on an idle connection before sending a keep-alive request. Set to zero to disable this feature. |1800000 |connectionPool.keyCertChainFile |The X.509 certificate chain file in PEM format. |_none_ |connectionPool.keyFile |The `PKCS#8` private key file in PEM format. |_none_ - |connectionPool.keyPassword |The password of the `keyFile` if it's not password-protected |_none_ + |connectionPool.keyPassword |The password of the `keyFile` if it is password-protected |_none_ |connectionPool.maxContentLength |The maximum length in bytes that a message can be sent to the server. This number can be no greater than the setting of the same name in the server configuration. |65536 |connectionPool.maxInProcessPerConnection |The maximum number of in-flight requests that can occur on a connection. |4 |connectionPool.maxSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. |16
