| commit | 1e03787f6b400e06eab9cd24bd3df96213eb0d38 | [log] [tgz] |
|---|---|---|
| author | Jake Biesinger <jake.biesinger@gmail.com> | Thu Aug 22 15:32:42 2013 -0700 |
| committer | Jake Biesinger <jake.biesinger@gmail.com> | Thu Aug 22 15:32:42 2013 -0700 |
| tree | d5dea98d1eb5798eb31e4a8a8c1ab22ec863ea13 | |
| parent | 630586cd424a9cab3263d0726241a0c886ac554f [diff] | |
| parent | fc4fe250422b4210e9b560e6bfd917aea2cc01b5 [diff] |
Merge branch 'anbangx/backupMergingWithMaster_errorcase' into wbiesing/merge_fs_backup Conflicts: genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobGen/JobGenerator.java genomix/genomix-pregelix/src/test/java/edu/uci/ics/genomix/pregelix/JobRun/PathMergeTestSuite.java genomix/genomix-pregelix/src/test/resources/jobs/P4ForMergeGraph.xml