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 2019/12/14 02:21:57 UTC

[tinkerpop] 01/03: Merge branch 'pr-1227' into tp33

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 5929975d49e8070cabbe3e809570ad353e0eec79
Merge: 6387f0f 075991e
Author: stephen <sp...@gmail.com>
AuthorDate: Fri Dec 13 20:43:24 2019 -0500

    Merge branch 'pr-1227' into tp33

 CHANGELOG.asciidoc                                 |  1 +
 .../apache/tinkerpop/gremlin/driver/Cluster.java   | 18 +++++++++---
 .../gremlin/server/GremlinDriverIntegrateTest.java |  6 ++++
 .../gremlin/server/TestClientFactory.java          |  1 +
 .../src/test/resources/conf/remote-objects.yaml    | 32 ++++++++++++++++++++++
 5 files changed, 54 insertions(+), 4 deletions(-)