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 2018/06/18 20:06:47 UTC

[1/3] tinkerpop git commit: TINKERPOP-1780 Redirected some tests to the secure server for auth testing CTR

Repository: tinkerpop
Updated Branches:
  refs/heads/master c811ee907 -> d16153db5


TINKERPOP-1780 Redirected some tests to the secure server for auth testing CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4e087da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4e087da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4e087da

Branch: refs/heads/master
Commit: a4e087da1fb9b6b698f3eecbdd9b3cd457baa7f1
Parents: 891bfa3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 18 16:05:36 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 18 16:05:36 2018 -0400

----------------------------------------------------------------------
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4e087da/gremlin-python/src/main/jython/tests/conftest.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/tests/conftest.py b/gremlin-python/src/main/jython/tests/conftest.py
index 96ded16..a654719 100644
--- a/gremlin-python/src/main/jython/tests/conftest.py
+++ b/gremlin-python/src/main/jython/tests/conftest.py
@@ -38,7 +38,7 @@ def connection(request):
     executor = concurrent.futures.ThreadPoolExecutor(5)
     pool = queue.Queue()
     try:
-        conn = Connection('ws://localhost:45940/gremlin', 'gmodern', protocol,
+        conn = Connection('ws://localhost:45941/gremlin', 'gmodern', protocol,
                           lambda: TornadoTransport(), executor, pool)
     except OSError:
         executor.shutdown()


[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

Posted by sp...@apache.org.
Merge branch 'tp32' into tp33


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d71dc1c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d71dc1c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d71dc1c

Branch: refs/heads/master
Commit: 5d71dc1c50d7ba2404a058f5be56fb1da8108583
Parents: ba82a5c a4e087d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 18 16:06:26 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 18 16:06:26 2018 -0400

----------------------------------------------------------------------
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d71dc1c/gremlin-python/src/main/jython/tests/conftest.py
----------------------------------------------------------------------


[3/3] tinkerpop git commit: Merge branch 'tp33'

Posted by sp...@apache.org.
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d16153db
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d16153db
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d16153db

Branch: refs/heads/master
Commit: d16153db525a67b014db738e1c97ba68b8068f8d
Parents: c811ee9 5d71dc1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 18 16:06:38 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 18 16:06:38 2018 -0400

----------------------------------------------------------------------
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------