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

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

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

2018-06-04 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/055f1d5e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e Diff:

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

2018-04-27 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71bc37fd Tree: