| commit | 538162f606623b7f01ae1e4f01f3ed2c16306f7e | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Thu Oct 24 12:25:28 2013 -0700 |
| committer | zheilbron <zheilbron@gmail.com> | Thu Oct 24 12:25:28 2013 -0700 |
| tree | 90644fcb8f4324f9d23d84fadc490906c0a1f068 | |
| parent | c9fe02224d3bdbc08100a060e9e7ab69ca1aaf10 [diff] | |
| parent | eb32b694243e1c560230faf2256108537cbf3a24 [diff] |
Merge remote-tracking branch 'origin/raman/master_feeds' into zheilbron/hyracks_msr_demo Conflicts: hyracks/hyracks-control/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/job/JobRun.java hyracks/hyracks-storage-am-common/src/main/java/edu/uci/ics/hyracks/storage/am/common/impls/AbstractTreeIndex.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