You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by di...@apache.org on 2020/12/03 05:54:29 UTC

[tinkerpop] branch master updated (587bb9d -> cb2007e)

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

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


    from 587bb9d  Merge branch '3.4-dev'
     add e242460  TINKERPOP-2482 Rename wsConnectionTimeout to connectionSetupTimeout (#1367)
     new cb2007e  Merge branch '3.4-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 docs/src/reference/gremlin-variants.asciidoc       |  2 +-
 .../tinkerpop/gremlin/driver/Channelizer.java      |  2 +-
 .../apache/tinkerpop/gremlin/driver/Cluster.java   | 27 +++++++++++-----------
 .../tinkerpop/gremlin/driver/Connection.java       |  2 +-
 .../apache/tinkerpop/gremlin/driver/Settings.java  | 12 ++++++----
 .../driver/handler/WebSocketClientHandler.java     |  6 ++---
 .../gremlin/driver/ClusterBuilderTest.java         |  2 +-
 .../tinkerpop/gremlin/driver/SettingsTest.java     |  4 ++--
 8 files changed, 30 insertions(+), 27 deletions(-)


[tinkerpop] 01/01: Merge branch '3.4-dev'

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit cb2007eb2d250eebfe47327b425a80bc661b4d08
Merge: 587bb9d e242460
Author: Divij Vaidya <di...@amazon.com>
AuthorDate: Wed Dec 2 11:01:45 2020 -0800

    Merge branch '3.4-dev'

 docs/src/reference/gremlin-variants.asciidoc       |  2 +-
 .../tinkerpop/gremlin/driver/Channelizer.java      |  2 +-
 .../apache/tinkerpop/gremlin/driver/Cluster.java   | 27 +++++++++++-----------
 .../tinkerpop/gremlin/driver/Connection.java       |  2 +-
 .../apache/tinkerpop/gremlin/driver/Settings.java  | 12 ++++++----
 .../driver/handler/WebSocketClientHandler.java     |  6 ++---
 .../gremlin/driver/ClusterBuilderTest.java         |  2 +-
 .../tinkerpop/gremlin/driver/SettingsTest.java     |  4 ++--
 8 files changed, 30 insertions(+), 27 deletions(-)