You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/13 00:16:20 UTC
[8/9] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1125-to-1127' into tp31
Merge remote-tracking branch 'origin/TINKERPOP-1125-to-1127' into tp31
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/71ed3134
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/71ed3134
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/71ed3134
Branch: refs/heads/tp31
Commit: 71ed3134dd1fb6eb6edb156e49938912a0472051
Parents: 1de73e5 ec6499f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Feb 12 17:58:37 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Feb 12 17:58:37 2016 -0500
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/driver/Client.java | 2 +-
.../gremlin/driver/ConnectionPool.java | 3 +++
.../apache/tinkerpop/gremlin/driver/Host.java | 23 ++++++++++++--------
.../AbstractGremlinServerIntegrationTest.java | 4 ++++
.../server/GremlinServerIntegrateTest.java | 19 ++++++++++++----
5 files changed, 37 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/71ed3134/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 7e6330f,c64cf8b..6990fde
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@@ -21,13 -21,9 +21,10 @@@ package org.apache.tinkerpop.gremlin.se
import java.io.File;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.log4j.Logger;
- import org.apache.tinkerpop.gremlin.driver.Client;
- import org.apache.tinkerpop.gremlin.driver.Cluster;
- import org.apache.tinkerpop.gremlin.driver.ResultSet;
- import org.apache.tinkerpop.gremlin.driver.Tokens;
+ import org.apache.tinkerpop.gremlin.driver.*;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
+import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import org.apache.tinkerpop.gremlin.driver.simple.NioClient;