| commit | 935f676fba1e851558f57a28bbc7ad80c74a01c4 | [log] [tgz] |
|---|---|---|
| author | Jake Biesinger <jake.biesinger@gmail.com> | Fri May 17 14:33:59 2013 -0700 |
| committer | Jake Biesinger <jake.biesinger@gmail.com> | Fri May 17 14:33:59 2013 -0700 |
| tree | cf3debf13bc836ef63052b6ce4b5262475984442 | |
| parent | b19726a01945d29919fbbbaae09b39fbae50603f [diff] | |
| parent | a688f7d29a69104734ff7a04486ba127591636fc [diff] |
Merge branch 'genomix/velvet_graphbuilding' into genomix/fullstack_genomix Conflicts: genomix/genomix-data/.classpath genomix/genomix-data/.project genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/valvetgraphbuilding/DeepGraphBuildingMapper.java genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/valvetgraphbuilding/DeepGraphBuildingReducer.java genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/valvetgraphbuilding/GraphInvertedIndexBuildingMapper.java