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

2018-10-04 Thread spmallette
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/86b1be53 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/86b1be53 Diff:

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

2018-10-03 Thread spmallette
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/650f31f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/650f31f1 Diff:

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

2018-09-21 Thread spmallette
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/bf79a49a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf79a49a Diff:

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

2018-08-22 Thread rdale
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/b34515a9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34515a9 Diff:

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

2018-07-12 Thread jorgebg
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/bf07f13b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf07f13b Diff:

[4/4] 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: