tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [3/3] tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1467-master'
Date Tue, 04 Oct 2016 17:41:04 GMT
Merge remote-tracking branch 'origin/TINKERPOP-1467-master'

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/5e55379a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5e55379a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5e55379a

Branch: refs/heads/master
Commit: 5e55379a8d25a5964bb9554206651cebd7a591ce
Parents: 8ab682f 9d860ca
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Tue Oct 4 13:40:52 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Tue Oct 4 13:40:52 2016 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../upgrade/release-3.1.x-incubating.asciidoc   | 17 +++++
 .../tinkerpop/gremlin/driver/Channelizer.java   |  2 +-
 .../apache/tinkerpop/gremlin/driver/Client.java | 42 +++++++++--
 .../tinkerpop/gremlin/driver/Cluster.java       | 24 +++++-
 .../tinkerpop/gremlin/driver/Connection.java    | 67 +++++++++++++++--
 .../gremlin/driver/ConnectionPool.java          | 21 +++---
 .../tinkerpop/gremlin/driver/Handler.java       | 26 +++++--
 .../tinkerpop/gremlin/driver/ResultQueue.java   |  4 +
 .../driver/handler/WebSocketClientHandler.java  |  4 +-
 .../server/GremlinDriverIntegrateTest.java      | 79 +++++++++++++++++++-
 .../server/GremlinServerAuthIntegrateTest.java  |  5 +-
 .../GremlinServerAuthOldIntegrateTest.java      |  4 +-
 .../GremlinServerSessionIntegrateTest.java      |  6 +-
 14 files changed, 255 insertions(+), 47 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5e55379a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index dc2b03b,86ed392..93308b6
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -429,7 -427,7 +429,8 @@@ image::https://raw.githubusercontent.co
  TinkerPop 3.1.5 (Release Date: NOT OFFICIALLY RELEASED YET)
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
+ * Improved handling of `Cluster.close()` and `Client.close()` to prevent the methods from
hanging.
 +* Fixed a bug in `NotStep` where child requirements were not being analyzed.
  * Fixed output redirection and potential memory leak in `GremlinGroovyScriptEngine`.
  * Corrected naming of `g_withPath_V_asXaX_out_out_mapXa_name_it_nameX` and `g_withPath_V_asXaX_out_mapXa_nameX`
in `MapTest`.
  * Improved session cleanup when a close is triggered by the client.


Mime
View raw message