Merge remote-tracking branch 'origin/TINKERPOP-1354' into tp31

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

Branch: refs/heads/TINKERPOP-1254
Commit: 6836f2ff50f2d53193180718510a478ceb30fccd
Parents: 17aab3e c37c301
Author: Stephen Mallette <[email protected]>
Authored: Wed Jul 6 11:23:03 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Wed Jul 6 11:23:03 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../upgrade/release-3.1.x-incubating.asciidoc   | 12 +++++
 .../gremlin/process/traversal/Scope.java        |  2 -
 .../server/op/AbstractEvalOpProcessor.java      | 54 +++++++++++++++++---
 .../server/GremlinServerIntegrateTest.java      | 21 +++++++-
 5 files changed, 79 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6836f2ff/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6836f2ff/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/release-3.1.x-incubating.asciidoc
index d8c5de2,504baaa..060d842
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@@ -52,18 -62,10 +62,20 @@@ still possible to get a timeout on a re
  refers to how long the console will wait for a response from the server 
before giving up. By default, the timeout is
  set to `none`.
  
 -See: https://issues.apache.org/jira/browse/TINKERPOP-1267[TINKERPOP-1267]
 +See: link:https://issues.apache.org/jira/browse/TINKERPOP-1267[TINKERPOP-1267]
 +
 +Gremlin Server Workers
 +^^^^^^^^^^^^^^^^^^^^^^
 +
 +Past configuration recommendations for the `threadPoolWorker` setting on 
Gremlin Server stated this value could be
 +safely set to `1` at the low end. A size of `1` is still valid for most 
cases, however, if Gremlin Server is being used
 +with sessions that accept parallel requests, then this value should be no 
less than `2` or else certain scripts (i.e.
 +those that block for an extended period of time) may cause Gremlin Server to 
lock up the session.
 +
 +See: link:https://issues.apache.org/jira/browse/TINKERPOP-1350[TINKERPOP-1350]
  
+ 
+ 
  Upgrading for Providers
  ~~~~~~~~~~~~~~~~~~~~~~~
  

Reply via email to