merge tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/de02cd28 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de02cd28 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de02cd28 Branch: refs/heads/master Commit: de02cd28a6c83a622dbd40f4d378de5c7a8a097f Parents: a215a52 e1c46b2 Author: Robert Dale <[email protected]> Authored: Tue Sep 4 12:51:35 2018 -0400 Committer: Robert Dale <[email protected]> Committed: Tue Sep 4 12:51:35 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/reference/gremlin-applications.asciidoc | 82 +++++-- .../upgrade/release-3.2.x-incubating.asciidoc | 26 +++ gremlin-console/conf/remote-secure.yaml | 3 +- .../tinkerpop/gremlin/driver/Cluster.java | 180 ++++++++++++++- .../tinkerpop/gremlin/driver/Settings.java | 83 +++++++ .../tinkerpop/gremlin/driver/SettingsTest.java | 17 ++ .../conf/gremlin-server-rest-secure.yaml | 7 +- gremlin-server/conf/gremlin-server-secure.yaml | 7 +- .../gremlin/server/AbstractChannelizer.java | 91 ++++++-- .../tinkerpop/gremlin/server/Settings.java | 66 +++++- .../AbstractGremlinServerIntegrationTest.java | 13 ++ .../server/GremlinServerAuthIntegrateTest.java | 4 +- .../GremlinServerAuthKrb5IntegrateTest.java | 5 +- .../server/GremlinServerIntegrateTest.java | 225 ++++++++++++++++--- ...ctGremlinServerChannelizerIntegrateTest.java | 12 +- .../src/test/resources/client-key.jks | Bin 0 -> 2241 bytes .../src/test/resources/client-key.p12 | Bin 0 -> 2583 bytes .../src/test/resources/client-trust.jks | Bin 0 -> 969 bytes .../src/test/resources/client-trust.p12 | Bin 0 -> 1202 bytes .../src/test/resources/server-key.jks | Bin 0 -> 2258 bytes .../src/test/resources/server-key.p12 | Bin 0 -> 2613 bytes .../src/test/resources/server-trust.jks | Bin 0 -> 952 bytes .../src/test/resources/server-trust.p12 | Bin 0 -> 1186 bytes 24 files changed, 726 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de02cd28/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java ----------------------------------------------------------------------
