You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/01/05 23:54:37 UTC
[05/50] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1026'
Merge branch 'TINKERPOP-1026'
Resolved Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4f4384bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4f4384bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4f4384bc
Branch: refs/heads/TINKERPOP-1033
Commit: 4f4384bca5100089b56ffd82e624b8615dc8acc2
Parents: 529512f be30e2d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Dec 18 19:02:27 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Dec 18 19:02:27 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/reference/the-graphcomputer.asciidoc | 11 +-
.../computer/bulkloading/BulkLoader.java | 8 +-
.../bulkloading/BulkLoaderVertexProgram.java | 10 +-
.../bulkloading/IncrementalBulkLoader.java | 8 +-
.../computer/bulkloading/OneTimeBulkLoader.java | 109 +++++++++++++++++++
.../process/GroovyProcessComputerSuite.java | 1 -
.../BulkLoaderVertexProgramTest.java | 49 ++++++++-
8 files changed, 173 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4f4384bc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index f90c92d,abac39c..4e6d849
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,7 -26,7 +26,8 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.1.1 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a bug in `Graph.OptOut` when trying to opt-out of certain test cases with the `method` property set to "*".
+ * Added another `BulkLoader` implementation (`OneTimeBulkLoader`) that doesn't store temporary properties in the target graph.
* Fixed a `SparkGraphComputer` sorting bug in MapReduce that occurred when there was more than one partition.
* Added `strictTransactionManagement` to the Gremlin Server settings to indicate that the `aliases` parameter must be passed on requests and that transaction management will be scoped to the graphs provided in that argument.
* Fixed a `NullPointerException` bug in `PeerPressureVertexProgram` that occurred when an adjacency traversal was not provided.