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/12 17:06:06 UTC
[4/6] tinkerpop git commit: Merge branch 'pr-671'
Merge branch 'pr-671'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c03768a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c03768a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c03768a
Branch: refs/heads/master
Commit: 2c03768ab65846052f261227c8d36589121e2458
Parents: 01d8936 325499c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 13:03:05 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 13:03:05 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 7 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 9 +
.../gremlin/server/AbstractChannelizer.java | 16 +-
.../server/channel/WebSocketChannelizer.java | 9 +-
.../server/channel/WsAndHttpChannelizer.java | 61 ++++
.../SaslAndHttpBasicAuthenticationHandler.java | 59 ++++
.../handler/SaslAuthenticationHandler.java | 2 +-
.../server/handler/WebSocketHandlerUtil.java | 38 ++
.../handler/WsAndHttpChannelizerHandler.java | 87 +++++
.../AbstractGremlinServerIntegrationTest.java | 23 +-
.../server/GremlinServerHttpIntegrateTest.java | 18 -
.../server/GremlinServerIntegrateTest.java | 37 --
...tGremlminServerChannelizerIntegrateTest.java | 346 +++++++++++++++++++
.../channel/HttpChannelizerIntegrateTest.java | 56 +++
.../channel/NioChannelizerIntegrateTest.java | 56 +++
.../WebSocketChannelizerIntegrateTest.java | 56 +++
.../WsAndHttpChannelizerIntegrateTest.java | 58 ++++
18 files changed, 871 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c03768a/CHANGELOG.asciidoc
----------------------------------------------------------------------