You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by jo...@apache.org on 2018/08/23 08:16:55 UTC
[08/14] tinkerpop git commit: Switched from TLS sockets to normal
socket on connection to gremlin secure server.
Switched from TLS sockets to normal socket on connection to gremlin secure server.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bdecf85f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdecf85f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdecf85f
Branch: refs/heads/TINKERPOP-1977
Commit: bdecf85fb5a0df9d11bffc948bd213921125e0de
Parents: 5e5a09b
Author: Matthew Allen <ma...@runbox.com>
Authored: Wed Jul 18 23:35:12 2018 +0100
Committer: Matthew Allen <ma...@runbox.com>
Committed: Thu Aug 23 06:38:58 2018 +0100
----------------------------------------------------------------------
.../src/main/javascript/gremlin-javascript/test/helper.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdecf85f/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
index 99fea7f..5a90296 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
@@ -26,12 +26,9 @@ const DriverRemoteConnection = require('../lib/driver/driver-remote-connection')
exports.getConnection = function getConnection(traversalSource) {
return new DriverRemoteConnection('ws://localhost:45940/gremlin', { traversalSource: traversalSource });
-<<<<<<< HEAD
-=======
};
exports.getSecureConnectionWithAuthenticator = function getConnection(traversalSource) {
const authenticator = new SaslAuthenticator({ username: 'stephen', password: 'password' });
- return new DriverRemoteConnection('wss://localhost:45941/gremlin', { traversalSource: traversalSource, authenticator: authenticator, rejectUnauthorized: false });
->>>>>>> 65de11c3c8... Submit can accept an existing requestId.
+ return new DriverRemoteConnection('ws://localhost:45941/gremlin', { traversalSource: traversalSource, authenticator: authenticator, rejectUnauthorized: false });
};
\ No newline at end of file