| commit | 08c11272cc3277d17b532fc511d0621d883af880 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Thu Oct 24 13:12:44 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Thu Oct 24 13:12:44 2013 -0700 |
| tree | b016c27ac72c69c8cf6aaef8e9db8c5567c527a8 | |
| parent | 538162f606623b7f01ae1e4f01f3ed2c16306f7e [diff] | |
| parent | 5130f9712bee0f0d4edf95fdcca1c4207e45002a [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 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