| commit | c0ea3e3b24b206f2517447c5688578319deacbfe | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Thu Nov 07 12:50:00 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Thu Nov 07 12:50:00 2013 -0800 |
| tree | d039f75961d5759dfe9130cb7c6c497ce28e3081 | |
| parent | 08c11272cc3277d17b532fc511d0621d883af880 [diff] | |
| parent | 113065df96cba7500b21e366d7adafac07498612 [diff] |
Merge branch 'master' into zheilbron/hyracks_msr_demo
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 a42b411..b2ac4a5 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
@@ -610,6 +610,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