| commit | a082fa74db87bb5703fde4e07c8ab106a9660d78 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Mon Nov 25 17:40:33 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Mon Nov 25 17:40:33 2013 -0800 |
| tree | bd7ed03f68cba5224938f3173ab47d07671d9e05 | |
| parent | b385095168b5bdc4e57f709e29c619ad39cf888c [diff] | |
| parent | 65829654836b13f61f8d02b77685549ba6afde49 [diff] |
Merge branch 'master' into zheilbron/hyracks_msr_demo Conflicts: hyracks/hyracks-control/hyracks-control-nc/src/main/java/edu/uci/ics/hyracks/control/nc/NodeControllerService.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 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-dataflow/src/main/java/edu/uci/ics/pregelix/dataflow/context/NoBudgetIndexLifecycleManager.java b/pregelix-dataflow/src/main/java/edu/uci/ics/pregelix/dataflow/context/NoBudgetIndexLifecycleManager.java index 5484f78..0c97230 100644 --- a/pregelix-dataflow/src/main/java/edu/uci/ics/pregelix/dataflow/context/NoBudgetIndexLifecycleManager.java +++ b/pregelix-dataflow/src/main/java/edu/uci/ics/pregelix/dataflow/context/NoBudgetIndexLifecycleManager.java
@@ -178,7 +178,7 @@ } } - private void dumpState(OutputStream os) throws IOException { + public void dumpState(OutputStream os) throws IOException { StringBuilder sb = new StringBuilder(); String headerFormat = "%-20s %-10s %-20s %-20s %-20s\n";
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