Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8c36eb8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8c36eb8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8c36eb8
Branch: refs/heads/master
Commit: a8c36eb82a0a66df4c7674391d679f2e8e479b56
Parents: 8f5b61d c8c77af
Author: Stephen Mallette <[email protected]>
Authored: Fri Jul 8 14:58:58 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Fri Jul 8 14:58:58 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++
.../tinkerpop/gremlin/driver/Connection.java | 5 ++-
.../gremlin/driver/ConnectionPool.java | 46 +++++++++-----------
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
.../conf/gremlin-server-rest-secure.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 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/op/session/Session.java | 4 ++
.../server/op/session/SessionOpProcessor.java | 1 -
.../server/GremlinDriverIntegrateTest.java | 9 +++-
.../GremlinServerAuthOldIntegrateTest.java | 4 +-
.../GremlinServerSessionIntegrateTest.java | 17 +++++---
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
16 files changed, 60 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/conf/gremlin-server-rest-secure.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/conf/gremlin-server-secure.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/conf/gremlin-server-spark.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/conf/gremlin-server.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-integration.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8c36eb8/gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/server/gremlin-server-performance.yaml
----------------------------------------------------------------------
