| commit | 8663daa45565b5a6e9aef6a9bf50d9bb3d082a41 | [log] [tgz] |
|---|---|---|
| author | Nan Zhang <zhangnan2920214@gmail.com> | Wed May 22 20:56:57 2013 -0700 |
| committer | Nan Zhang <zhangnan2920214@gmail.com> | Wed May 22 20:56:57 2013 -0700 |
| tree | 7956b0e4de65302bebef233c2449436e17781586 | |
| parent | d01123b3243b2c5649f5dde895618f6a93214224 [diff] | |
| parent | 369fccb2e484736f006a5aa6a378eff75af754a7 [diff] |
Merge branch 'nanzhang/genomix' into genomix/fullstack_genomix Conflicts: genomix/genomix-data/src/main/java/edu/uci/ics/genomix/type/NodeWritable.java genomix/genomix-hadoop/src/main/java/edu/uci/ics/genomix/hadoop/velvetgraphbuilding/GraphInvertedIndexBuildingMapper.java