You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2017/01/09 14:20:30 UTC
[1/3] tinkerpop git commit: fixed ssl.keyPassword description
Repository: tinkerpop
Updated Branches:
refs/heads/master 362bb052f -> d64f270ca
fixed ssl.keyPassword description
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a27a0483
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a27a0483
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a27a0483
Branch: refs/heads/master
Commit: a27a04831fa7e43b26d23f14091b615a088eac83
Parents: 7ba7ecd
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jan 9 09:16:36 2017 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Mon Jan 9 09:16:36 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/a27a0483/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 235e2c5..1a2398d 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -615,7 +615,7 @@ The following table describes the various configuration options for the Gremlin
|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.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
@@ -851,8 +851,8 @@ The following table describes the various configuration options that Gremlin Ser
|ssl.enabled |Determines if SSL is turned on or not. |false
|ssl.keyCertChainFile |The X.509 certificate chain file in PEM format. If this value is not present and `ssl.enabled` is `true` a self-signed certificate will be used (not suitable for production). |_none_
|ssl.keyFile |The `PKCS#8` private key file in PEM format. If this value is not present and `ssl.enabled` is `true` a self-signed certificate will be used (not suitable for production). |_none_
-|ssl.keyPassword |The password of the `keyFile` if it's not password-protected |_none_
-|ssl.trustCertChainFile |Trusted certificates for verifying the remote endpoint's certificate. The file should contain an X.509 certificate chain in PEM format. A system default will be used if this setting is not present. |_none_
+|ssl.keyPassword |The password of the `keyFile` if it is password-protected |_none_
+|ssl.trustCertChainFile |Trusted certificates for verifying the remote endpoint's certificate. The file should contain an X.509 certificate chain in PEM format. A system default will be used if this setting is not present. (Not supported) |_none_
|strictTransactionManagement |Set to `true` to require `aliases` to be submitted on every requests, where the `aliases` become the scope of transaction management. |false
|threadPoolBoss |The number of threads available to Gremlin Server for accepting connections. Should always be set to `1`. |1
|threadPoolWorker |The number of threads available to Gremlin Server for processing non-blocking reads and writes. |1
[2/3] tinkerpop git commit: Merge branch 'tp31' into tp32
Posted by rd...@apache.org.
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/master
Commit: be5b64a5c089a6b2c3a98bdc062438cde8096a73
Parents: 2f68d7e a27a048
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jan 9 09:17:10 2017 -0500
Committer: Robert Dale <ro...@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
[3/3] tinkerpop git commit: Merge branch 'tp32'
Posted by rd...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d64f270c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d64f270c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d64f270c
Branch: refs/heads/master
Commit: d64f270ca798623c865685d7106d343bd4d8052b
Parents: 362bb05 be5b64a
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jan 9 09:17:27 2017 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Mon Jan 9 09:17:27 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/d64f270c/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------