Merge branch 'TINKERPOP-1442' into TINKERPOP-1442-master Conflicts: CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1a2ba975 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1a2ba975 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1a2ba975 Branch: refs/heads/TINKERPOP-1442-master Commit: 1a2ba97591f4cac99fbdbdfcd7091ae668ab9444 Parents: c2c0023 75baf01 Author: Stephen Mallette <sp...@genoprime.com> Authored: Fri Sep 16 07:35:23 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Fri Sep 16 07:35:23 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../tinkerpop/gremlin/driver/Connection.java | 2 +- .../gremlin/groovy/engine/GremlinExecutor.java | 2 +- .../gremlin/server/op/session/Session.java | 12 +++++++ .../server/op/session/SessionOpProcessor.java | 9 ++++++ .../server/GremlinDriverIntegrateTest.java | 2 +- .../server/GremlinServerIntegrateTest.java | 4 +-- .../GremlinServerSessionIntegrateTest.java | 33 ++++++++++++++++++++ 8 files changed, 60 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2ba975/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2ba975/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2ba975/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2ba975/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1a2ba975/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java ----------------------------------------------------------------------