This is an automated email from the ASF dual-hosted git repository.

jorgebg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit f6574ca50eabf66349ae0ed4acf0353e96fdc1f2
Merge: 462079b 6541c81
Author: Jorge Bay Gondra <jorgebaygon...@gmail.com>
AuthorDate: Mon Nov 5 14:29:34 2018 +0100

    Merge branch 'tp33'

 docs/src/reference/gremlin-variants.asciidoc       |  23 +++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc |  29 +--
 gremlin-javascript/pom.xml                         |   2 +-
 .../main/javascript/gremlin-javascript/index.js    |  14 +-
 .../gremlin-javascript/lib/driver/client.js        |  16 +-
 .../{driver-remote-connection.js => connection.js} |  76 +++----
 .../lib/driver/driver-remote-connection.js         | 218 ++-------------------
 .../lib/driver/remote-connection.js                |  40 ++--
 .../gremlin-javascript/lib/driver/result-set.js    |  92 +++++++++
 .../javascript/gremlin-javascript/lib/utils.js     |   6 +-
 .../javascript/gremlin-javascript/test/helper.js   |  21 +-
 .../test/integration/client-tests.js               |  47 +++--
 .../test/integration/remote-connection-tests.js    |   1 +
 .../test/integration/sasl-authentication-tests.js  |  57 +++---
 .../gremlin-javascript/test/unit/exports-test.js   |  18 +-
 .../test/unit/result-set-test.js                   |  86 ++++++++
 16 files changed, 398 insertions(+), 348 deletions(-)

diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
index 8c89b2b,7f8c80f..7f97b40
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
@@@ -49,10 -51,9 +51,10 @@@ module.exports = 
      }
    },
    process: {
-     Bytecode: Bytecode,
+     Bytecode,
      EnumValue: t.EnumValue,
      P: t.P,
 +    TextP: t.TextP,
      Traversal: t.Traversal,
      TraversalSideEffects: t.TraversalSideEffects,
      TraversalStrategies: strategiesModule.TraversalStrategies,

Reply via email to