This is an automated email from the ASF dual-hosted git repository. spmallette pushed a change to branch 3.4-dev in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from b4fd63e Merge branch '3.3-dev' into 3.4-dev add 99713ff Add trustStoreType such that keystore and truststore can be different type add a25b7ae Merge branch 'pr-1244' into 3.3-dev add 616862d Updated changelog CTR add 6d329ae Merge branch '3.3-dev' into 3.4-dev add bb0a9df All SSL tests moved to their own class No new revisions were added by this update. Summary of changes: CHANGELOG.asciidoc | 3 + .../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++++- .../apache/tinkerpop/gremlin/driver/Settings.java | 9 +++ .../tinkerpop/gremlin/driver/SettingsTest.java | 2 + .../gremlin/server/AbstractChannelizer.java | 6 +- .../apache/tinkerpop/gremlin/server/Settings.java | 5 ++ .../AbstractGremlinServerIntegrationTest.java | 2 + .../gremlin/server/GremlinServerIntegrateTest.java | 2 + .../server/GremlinServerSslIntegrateTest.java | 78 ++++++++++++++++++++++ 9 files changed, 119 insertions(+), 5 deletions(-)