You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/01/02 17:06:09 UTC

[tinkerpop] 02/02: Merge branch 'tp34'

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 0b2458916311e115296c6207f1893b8423e15223
Merge: d8921d0 712a23c
Author: stephen <sp...@gmail.com>
AuthorDate: Thu Jan 2 12:04:25 2020 -0500

    Merge branch 'tp34'

 CHANGELOG.asciidoc                                            |  1 +
 .../java/org/apache/tinkerpop/gremlin/driver/Connection.java  | 11 +----------
 .../gremlin/server/channel/WebSocketChannelizer.java          |  7 ++++++-
 .../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java  |  5 +----
 4 files changed, 9 insertions(+), 15 deletions(-)