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 09ce70cb40d536daab33dac1010ebd5f33656fa1 Merge: 79b5e1c 689e034 Author: Stephen Mallette <[email protected]> AuthorDate: Wed Dec 19 15:17:12 2018 -0500 Merge branch 'TINKERPOP-2110' into tp33 CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-applications.asciidoc | 1 + .../apache/tinkerpop/gremlin/driver/Cluster.java | 24 +++++++++++++++++----- .../org/apache/tinkerpop/gremlin/driver/Host.java | 6 +++--- .../apache/tinkerpop/gremlin/driver/Settings.java | 5 +++++ .../apache/tinkerpop/gremlin/driver/HostTest.java | 10 ++++++++- .../gremlin/server/AbstractChannelizer.java | 1 - .../server/channel/WebSocketChannelizer.java | 3 ++- 8 files changed, 40 insertions(+), 11 deletions(-)
