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: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef888a1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef888a1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef888a1b

Branch: refs/heads/TINKERPOP-1987
Commit: ef888a1b5380f563d688bd04fae0ea052e11d041
Parents: 4f462c5 4160b04
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 28 10:08:51 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 28 10:08:51 2018 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  2 +
 docs/src/dev/provider/index.asciidoc            | 13 +++
 .../reference/implementations-spark.asciidoc    | 64 ++-----------
 docs/src/reference/the-graphcomputer.asciidoc   | 85 ++++-------------
 .../upgrade/release-3.2.x-incubating.asciidoc   | 27 ++++++
 .../tinkerpop/gremlin/jsr223/CoreImports.java   |  2 +
 .../bulkdumping/BulkDumperVertexProgram.java    |  3 +
 .../computer/bulkloading/BulkLoader.java        |  2 +
 .../bulkloading/BulkLoaderVertexProgram.java    |  2 +
 .../bulkloading/IncrementalBulkLoader.java      |  2 +
 .../computer/bulkloading/OneTimeBulkLoader.java |  2 +
 .../computer/clone/CloneVertexProgram.java      | 98 ++++++++++++++++++++
 .../gremlin/process/remote/RemoteGraph.java     |  4 +
 .../gremlin/process/ProcessComputerSuite.java   |  2 +
 .../computer/clone/CloneVertexProgramTest.java  | 98 ++++++++++++++++++++
 15 files changed, 283 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/reference/the-graphcomputer.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------

Reply via email to