You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/09 20:30:40 UTC
[2/2] incubator-tinkerpop git commit: remerged.
remerged.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/24cae1f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/24cae1f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/24cae1f5
Branch: refs/heads/tp31
Commit: 24cae1f5633aa731f26f616ae00708d05e21ca78
Parents: 3eadf73 712fca2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Mar 9 12:19:58 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Mar 9 12:19:58 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +
.../src/reference/gremlin-applications.asciidoc | 39 ++-
.../upgrade/release-3.1.x-incubating.asciidoc | 9 +
gremlin-core/pom.xml | 1 -
.../apache/tinkerpop/gremlin/driver/Client.java | 1 -
.../tinkerpop/gremlin/driver/Cluster.java | 12 +
.../tinkerpop/gremlin/driver/Connection.java | 54 ++-
.../gremlin/driver/ConnectionPool.java | 2 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 5 +-
.../tinkerpop/gremlin/driver/Settings.java | 120 ++++++-
gremlin-server/pom.xml | 1 -
.../gremlin/server/op/session/Session.java | 37 ++-
.../server/op/session/SessionOpProcessor.java | 4 +-
.../server/GremlinDriverIntegrateTest.java | 1 +
.../server/GremlinServerIntegrateTest.java | 197 +----------
.../GremlinServerSessionIntegrateTest.java | 332 +++++++++++++++++++
pom.xml | 8 +-
17 files changed, 609 insertions(+), 218 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/24cae1f5/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 54df044,dda6e80..1829c5c
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,8 -26,11 +26,12 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug where `OrderGlobalStep` and `OrderLocalStep` were not incorporating their children's traverser requirements.
+ * Bump to commons-collections 3.2.2.
* Fixed a compilation bug in `TraversalExplanation`.
+ * Fixed bug where a session explicitly closed was being closed again by session expiration.
+ * Improved the recovery options for Gremlin Driver after failed requests to Gremlin Server.
+ * Added `maxWaitForSessionClose` to the settings for Gremlin Driver.
* Bumped to Netty 4.0.34.Final.
* Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".
* Bumped to Apache Groovy 2.4.6.