| commit | 2c48b660709333ea67ec6a1f1115c6f8a4b0ad88 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <zhangnan2920214@gmail.com> | Tue May 21 23:38:19 2013 -0700 |
| committer | Nan Zhang <zhangnan2920214@gmail.com> | Tue May 21 23:38:19 2013 -0700 |
| tree | efc06785168043a98b64d25ec4451ed42fc9034d | |
| parent | a6e78ab41b7f8844dc5d312f149c4c22c0299c4f [diff] | |
| parent | c49ce70fd95612d3c9309981ed585a489cd187ca [diff] |
Merge branch 'nanzhang/genomix' into genomix/fullstack_genomix
diff --git a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/client/Client.java b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/client/Client.java index 4014377..438c99d 100644 --- a/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/client/Client.java +++ b/genomix/genomix-pregelix/src/main/java/edu/uci/ics/genomix/pregelix/client/Client.java
@@ -17,7 +17,7 @@ import edu.uci.ics.pregelix.core.driver.Driver; public class Client { - + //test rebase private static class Options { @Option(name = "-inputpaths", usage = "comma seprated input paths", required = true) public String inputPaths;