Merge remote-tracking branch 'origin/TINKERPOP-1350' into tp31
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/17aab3e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/17aab3e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/17aab3e3
Branch: refs/heads/TINKERPOP-1254
Commit: 17aab3e3d25fa4de078e8cc24a55a166657ea38d
Parents: 320071d cd0e58b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 6 10:38:21 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 6 10:38:21 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
.../src/reference/gremlin-applications.asciidoc | 6 ++-
.../upgrade/release-3.1.x-incubating.asciidoc | 14 ++++-
.../gremlin/groovy/engine/GremlinExecutor.java | 51 +++++++++++-------
.../server/GremlinDriverIntegrateTest.java | 54 ++++++++++++++++++++
5 files changed, 105 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17aab3e3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index a6cbad0,6fcd00a..0096209
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,9 +26,10 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Avoided hamcrest conflict by using mockito-core instead of mockito-all
dependency in `gremlin-test`.
+* Enured calls to `Result.hasNext()` were idempotent.
+* Avoid hamcrest conflict by using mockito-core instead of mockito-all
dependency in `gremlin-test`.
+ * Fixed bug in `GremlinExecutor` causing Gremlin Server to lock up when
parallel requests were submitted on the same session if those parallel requests
included a script that blocked indefinitely.
+ * Changed `GremlinExecutor` timeout scheduling so that the timer would not
start until a time closer to the actual start of script evaluation.
* Fixed bug in `SubgraphStrategy` where step labels were not being propogated
properly to new steps injected by the strategy.
* Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML.
* Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not
hierarchical error for external graph implementations.
