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 2017/07/18 21:03:54 UTC
[21/50] [abbrv] tinkerpop git commit: Merge branch 'pr-618' into tp32
Merge branch 'pr-618' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c30b378b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c30b378b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c30b378b
Branch: refs/heads/TINKERPOP-1489
Commit: c30b378b3a61f62fb936a11740d6f981d8473f87
Parents: bd4b989 c264390
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 13:04:16 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 13:04:16 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 7 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 9 +
.../gremlin/server/AbstractChannelizer.java | 11 +-
.../server/channel/WebSocketChannelizer.java | 7 +-
.../server/channel/WsAndHttpChannelizer.java | 61 ++++
.../SaslAndHttpBasicAuthenticationHandler.java | 57 +++
.../server/handler/WebSocketHandlerUtil.java | 38 ++
.../handler/WsAndHttpChannelizerHandler.java | 87 +++++
.../AbstractGremlinServerIntegrationTest.java | 23 +-
.../server/GremlinServerHttpIntegrateTest.java | 6 -
.../server/GremlinServerIntegrateTest.java | 37 --
...tGremlminServerChannelizerIntegrateTest.java | 346 +++++++++++++++++++
.../channel/HttpChannelizerIntegrateTest.java | 56 +++
.../channel/NioChannelizerIntegrateTest.java | 56 +++
.../WebSocketChannelizerIntegrateTest.java | 56 +++
.../WsAndHttpChannelizerIntegrateTest.java | 58 ++++
17 files changed, 864 insertions(+), 52 deletions(-)
----------------------------------------------------------------------