| commit | c9fe02224d3bdbc08100a060e9e7ab69ca1aaf10 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Aug 23 11:45:40 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Aug 23 11:45:40 2013 -0700 |
| tree | 01f8a831a57e64bce0ddc800410a21c4c98cbb01 | |
| parent | a377a3c96bf4e77318dfd3aff30a32488f31501b [diff] | |
| parent | d2042930091be3f563efa9dab7fa57a49aec4e10 [diff] |
Merge branch 'master' into dev/hyracks_msr Conflicts: hyracks/hyracks-storage-am-lsm-common/src/main/java/edu/uci/ics/hyracks/storage/am/lsm/common/impls/LSMHarness.java
diff --git a/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java b/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java index 26cb8d0..f42dfe4 100644 --- a/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java +++ b/pregelix-api/src/main/java/edu/uci/ics/pregelix/api/graph/Vertex.java
@@ -618,6 +618,10 @@ * Terminate the current partition where the current vertex stays in. * This will immediately take effect and the upcoming vertice in the * same partition cannot be processed. + * <<<<<<< HEAD + * + ======= + * >>>>>>> master */ protected final void terminatePartition() { voteToHalt();
diff --git a/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/lib/io/SizeEstimationTest.java b/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/lib/io/SizeEstimationTest.java index 638011b..3fe13b1 100644 --- a/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/lib/io/SizeEstimationTest.java +++ b/pregelix-example/src/test/java/edu/uci/ics/pregelix/example/lib/io/SizeEstimationTest.java
@@ -173,4 +173,4 @@ } } -} +} \ No newline at end of file