You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/10/11 11:23:47 UTC

[1/2] tinkerpop git commit: Fixed doc error for scripEvaluationTimeout CTR

Repository: tinkerpop
Updated Branches:
  refs/heads/master f7c8564a5 -> 671dfae42


Fixed doc error for scripEvaluationTimeout CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae13291a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae13291a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae13291a

Branch: refs/heads/master
Commit: ae13291a39a1a51f367696e575d7ec554acc5b21
Parents: e97b56d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Oct 11 07:22:36 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Oct 11 07:22:36 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/provider/index.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae13291a/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index 05e42d0..b7f9f2d 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -794,7 +794,7 @@ be aliased to different variable names for purposes of the current request.  The
 global variable and its key represents the new binding name as it will be referenced in the Gremlin query.  For
 example, if the Gremlin Server defines two `TraversalSource` instances named `g1` and `g2`, it would be possible
 to send an alias pair with key of "g" and value of "g2" and thus allow the script to refer to "g2" simply as "g".
-|scriptEvalTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
+|scriptEvaluationTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
 |=========================================================
 
 Session OpProcessor
@@ -836,7 +836,7 @@ Gremlin Server are deployed, session state is not shared among them.
 |session |String | *Required* The session identifier for the current session - typically this value should be a UUID (the session will be created if it doesn't exist).
 |manageTransaction |Boolean |When set to `true` the transaction for the current request is auto-committed or rolled-back as are done with sessionless requests - defaulted to `false`.
 |bindings |Map |A map of key/value pairs to apply as variables in the context of the Gremlin script.
-|scriptEvalTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
+|scriptEvaluationTimeout |Long |An override for the server setting that determines the maximum time to wait for a script to execute on the server.
 |language |String |The flavor of Gremlin used (e.g. `gremlin-groovy`)
 |aliases |Map |A map of key/value pairs that allow globally bound `Graph` and `TraversalSource` objects to
 be aliased to different variable names for purposes of the current request.  The value represents the name the


[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/tp31'

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp31'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/671dfae4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/671dfae4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/671dfae4

Branch: refs/heads/master
Commit: 671dfae4235cde85696a7870fd982c0b4656314a
Parents: f7c8564 ae13291
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Oct 11 07:23:38 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Oct 11 07:23:38 2016 -0400

----------------------------------------------------------------------
 docs/src/dev/provider/index.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/671dfae4/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------