| commit | edbdb213d2ecdd8087238ad27c9cda692aed1242 | [log] [tgz] |
|---|---|---|
| author | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:08:29 2013 -0800 |
| committer | zheilbron <zheilbron@gmail.com> | Fri Dec 06 10:08:29 2013 -0800 |
| tree | e51cdec7d32f4229a2d921215bbda99f3b5c9cc6 | |
| parent | 7df1073dd82ddb9b842d16b7baeffb249fc36839 [diff] | |
| parent | 87b0e1e3685326a793c3a93d9cceec4ea501e69e [diff] |
Merge branch 'master' into zheilbron/hyracks_msr_demo
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