Merge branch 'tp31' of https://github.com/analytically/incubator-tinkerpop 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/3c4aaf59
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3c4aaf59
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3c4aaf59
Branch: refs/heads/master
Commit: 3c4aaf591ad8e35772d62c98961e3c36b03c9ff3
Parents: c90fc1e 1390541
Author: Stephen Mallette <[email protected]>
Authored: Fri Jul 8 16:43:35 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Jul 8 16:43:35 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.1.x-incubating.asciidoc | 5 +++++
.../process/traversal/dsl/graph/GraphTraversal.java | 2 +-
.../process/traversal/step/map/GroovyAddEdgeTest.groovy | 4 ++--
.../gremlin/process/traversal/step/map/AddEdgeTest.java | 8 ++++----
.../strategy/decoration/PartitionStrategyProcessTest.java | 8 ++++----
.../org/apache/tinkerpop/gremlin/structure/EdgeTest.java | 2 +-
.../apache/tinkerpop/gremlin/structure/PropertyTest.java | 10 +++++-----
.../org/apache/tinkerpop/gremlin/structure/io/IoTest.java | 6 +++---
9 files changed, 26 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c4aaf59/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 999b2a9,cbe6100..d013861
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -32,17 -31,13 +32,18 @@@ TinkerPop 3.1.3 (NOT OFFICIALLY RELEASE
* 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.
+* Fix incorrect test `FeatureRequirement` annotations.
* 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.
+* Fixed bug in `GremlinGroovyScriptEngineFileSandboxTest` resource loading
* Improved `TinkerGraph` performance when iterating vertices and edges.
* Fixed a bug where timeout functions provided to the `GremlinExecutor` were
not executing in the same thread as the script evaluation.
+* Fixed a bug in the driver where many parallel requests over a session would
sometimes force a connection to close and replace itself.
+ * Graph providers should no longer rely on the test suite to validate that
hyphens work for property keys.
* Optimized a few special cases in `RangeByIsCountStrategy`.
* Added more "invalid" variable bindings to the list used by Gremlin Server
to validate incoming bindings on requests.
+* Fixed a bug where the `ConnectionPool` in the driver would not grow with
certain configuration options.
+* Fixed a bug where pauses in Gremlin Server writing to an overtaxed client
would generate unexpected `FastNoSuchElementException` errors.
* Named the thread pool used by Gremlin Server sessions:
"gremlin-server-session-$n".
* Fixed a bug in `BulkSet.equals()` which made itself apparent when using
`store()` and `aggregate()` with labeled `cap()`.
* Fixed a bug where `Result.one()` could potentially block indefinitely under
certain circumstances.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c4aaf59/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c4aaf59/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/EdgeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3c4aaf59/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/PropertyTest.java
----------------------------------------------------------------------
