| commit | a377a3c96bf4e77318dfd3aff30a32488f31501b | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Wed Aug 21 14:48:51 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Wed Aug 21 14:48:51 2013 -0700 |
| tree | 005f92adf81828756d5ee0d7832a132d49c27a23 | |
| parent | d2e0048e56e3a0f99dede91ef601ae9583bff6b4 [diff] | |
| parent | bd2732cbcdc811034f3dc1896cb32035893f81f5 [diff] |
Merge branch 'master' into dev/hyracks_msr
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