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

2018-07-27 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: docs/src/tutorials/getting-started/index.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/66099fed Tree:

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

2018-07-26 Thread spmallette
Merge branch 'tp32' into tp33 Conflicts: gremlin-test/features/map/Select.feature Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/445a8bf0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/445a8bf0

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

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