Merge branch 'TINKERPOP-1296'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1818c893 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1818c893 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1818c893 Branch: refs/heads/master Commit: 1818c8933da53a7749b705ce71bfe3de587a5d38 Parents: 9bff0f4 1e0bc5f Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue May 8 08:27:28 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue May 8 08:27:28 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 5 +++ docs/src/upgrade/release-3.4.x.asciidoc | 18 +++++++--- .../src/test/resources/gremlin-server.yaml | 1 - .../gremlin/server/AbstractChannelizer.java | 7 +--- .../tinkerpop/gremlin/server/GraphManager.java | 22 ------------ .../tinkerpop/gremlin/server/Settings.java | 21 +----------- .../server/handler/OpSelectorHandler.java | 9 ----- .../gremlin/server/op/AbstractOpProcessor.java | 36 ++------------------ .../op/traversal/TraversalOpProcessor.java | 9 ----- .../server/util/DefaultGraphManager.java | 27 --------------- .../GremlinServerAuditLogIntegrateTest.java | 2 +- .../server/GremlinServerAuthIntegrateTest.java | 2 +- .../GremlinServerAuthKrb5IntegrateTest.java | 2 +- .../server/GremlinServerIntegrateTest.java | 24 ------------- 14 files changed, 27 insertions(+), 158 deletions(-) ----------------------------------------------------------------------