Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4917d887 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4917d887 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4917d887 Branch: refs/heads/master Commit: 4917d887068ad3593e658ea4719cdc494f30d8aa Parents: a71f565 33253dc Author: Robert Dale <robd...@gmail.com> Authored: Fri Jan 27 16:27:09 2017 -0500 Committer: Robert Dale <robd...@gmail.com> Committed: Fri Jan 27 16:27:09 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/reference/gremlin-applications.asciidoc | 3 +- .../upgrade/release-3.2.x-incubating.asciidoc | 9 ++ .../gremlin/server/AbstractChannelizer.java | 4 +- .../tinkerpop/gremlin/server/Settings.java | 6 ++ .../server/GremlinServerIntegrateTest.java | 88 +++++++++++++++++++- gremlin-server/src/test/resources/client.crt | 40 +++++++++ .../src/test/resources/client.key.pk8 | 47 +++++++++++ gremlin-server/src/test/resources/server.crt | 41 +++++++++ .../src/test/resources/server.key.pk8 | 47 +++++++++++ 10 files changed, 281 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4917d887/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4917d887/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4917d887/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4917d887/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4917d887/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java ----------------------------------------------------------------------
