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 2018/02/23 12:42:04 UTC
[8/9] tinkerpop git commit: Merge branch 'TINKERPOP-1726' into tp32
Merge branch 'TINKERPOP-1726' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d9705644
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d9705644
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d9705644
Branch: refs/heads/master
Commit: d9705644360763e7eff139358ae864c314925bd9
Parents: 3df6c58 1281878
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Feb 23 07:02:24 2018 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Feb 23 07:02:24 2018 -0500
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 13 +++--
.../upgrade/release-3.2.x-incubating.asciidoc | 15 ++++++
.../driver/handler/WebSocketClientHandler.java | 5 +-
gremlin-server/conf/gremlin-server-classic.yaml | 2 +
.../conf/gremlin-server-modern-py.yaml | 2 +
.../conf/gremlin-server-modern-readonly.yaml | 2 +
gremlin-server/conf/gremlin-server-modern.yaml | 2 +
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +
gremlin-server/conf/gremlin-server-secure.yaml | 2 +
gremlin-server/conf/gremlin-server-spark.yaml | 2 +
gremlin-server/conf/gremlin-server.yaml | 2 +
.../gremlin/server/AbstractChannelizer.java | 14 ++++-
.../tinkerpop/gremlin/server/Channelizer.java | 17 ++++++
.../tinkerpop/gremlin/server/GremlinServer.java | 11 +++-
.../tinkerpop/gremlin/server/Settings.java | 18 ++++++-
.../server/channel/WebSocketChannelizer.java | 11 ++++
.../server/channel/WsAndHttpChannelizer.java | 28 +++++-----
.../server/handler/OpSelectorHandler.java | 35 +++++++++++++
.../handler/WsAndHttpChannelizerHandler.java | 11 +++-
.../server/GremlinServerIntegrateTest.java | 55 +++++++++++++++++++-
.../gremlin/util/Log4jRecordingAppender.java | 5 +-
.../util/Log4jRecordingAppenderTest.java | 2 +-
.../remote/gremlin-server-integration.yaml | 2 +
.../server/gremlin-server-integration.yaml | 2 +
.../server/gremlin-server-performance.yaml | 2 +
26 files changed, 232 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9705644/CHANGELOG.asciidoc
----------------------------------------------------------------------