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

2018-03-01 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b516a6a5 Tree:

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

2018-02-28 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/032124a5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/032124a5 Diff:

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

2018-02-27 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: docs/src/dev/developer/for-committers.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/69a355f8 Tree:

<    1   2