Homec4science

Merge branch 'master' into disable_wal

Authored by lintool <jimmylin@umd.edu> on Mar 17 2014, 14:04.

Description

Merge branch 'master' into disable_wal

Conflicts:
src/main/java/org/warcbase/data/ExtractLinks.java

Details

Committed
lintool <jimmylin@umd.edu>Mar 17 2014, 14:04
Pushed
dportabellaOct 19 2016, 16:29
Parents
R1473:8c649e5336af: Fixed Issue #7
R1473:b430dc7c94f6: Merge branch 'jar_upgrade' into disable_wal
Branches
Unknown
Tags
Unknown

Event Timeline

lintool <jimmylin@umd.edu> committed R1473:d543a4957916: Merge branch 'master' into disable_wal (authored by lintool <jimmylin@umd.edu>).Mar 17 2014, 14:04

Merged Changes

CommitAuthorDetailsCommitted
8c649e5336aflintool
Fixed Issue #7 
Mar 17 2014
5ae6b8841cbelintool
Merge branch 'working' 
Mar 17 2014
53aacb335403Jeffyrao
code reformat via eclipse imported project 
Mar 17 2014
1ad985045d9aJeffyrao
code reformat 
Mar 16 2014
91d5e65858dbJinfeng Rao
remove hadoop-job.xml 
Mar 16 2014
5fb9d2a33a9eJinfeng Rao
remove assembly plugin for hadoop job 
Mar 16 2014