[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-04 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONReaderTests.cs

[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-10-03 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GroovyTranslatorTest.java Project:

[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-08-11 Thread florianhockmann
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/0bf76acd Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bf76acd Diff:

[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-27 Thread florianhockmann
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/4f462c53 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f462c53 Diff:

[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-11 Thread dkuppitz
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/cf6f9746 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf6f9746 Diff:

[8/9] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-04-09 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-javascript/src/main/javascript/gremlin-javascript/package.json Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46be1351 Tree: