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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java Project:

[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1985' into tp32

Merge branch 'TINKERPOP-1985' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4160b046 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4160b046 Diff:

[1/2] tinkerpop git commit: TINKERPOP-1985 Changing position on bulk import/export

Repository: tinkerpop Updated Branches: refs/heads/tp32 c02b9934c -> 4160b046a TINKERPOP-1985 Changing position on bulk import/export Deprecated BulkLoaderVertexProgram and BulkDumperVertexProgram. BLVP is not replaced, but BDVP has been renamed to CloneVertexProgram which is more aptly

[1/3] tinkerpop git commit: TINKERPOP-1985 Changing position on bulk import/export

Repository: tinkerpop Updated Branches: refs/heads/tp33 4f462c532 -> ef888a1b5 TINKERPOP-1985 Changing position on bulk import/export Deprecated BulkLoaderVertexProgram and BulkDumperVertexProgram. BLVP is not replaced, but BDVP has been renamed to CloneVertexProgram which is more aptly

[2/4] tinkerpop git commit: Merge branch 'TINKERPOP-1985' into tp32

Merge branch 'TINKERPOP-1985' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4160b046 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4160b046 Diff:

[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-1985' into tp32

Merge branch 'TINKERPOP-1985' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4160b046 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4160b046 Diff:

[1/4] tinkerpop git commit: TINKERPOP-1985 Changing position on bulk import/export

Repository: tinkerpop Updated Branches: refs/heads/master 935ef5c9d -> ec7e27ea0 TINKERPOP-1985 Changing position on bulk import/export Deprecated BulkLoaderVertexProgram and BulkDumperVertexProgram. BLVP is not replaced, but BDVP has been renamed to CloneVertexProgram which is more aptly

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

Merge branch 'tp33' Conflicts: docs/src/reference/the-graphcomputer.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec7e27ea Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec7e27ea Diff:

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

Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java Project: