Homec4science

Merge remote-tracking branch 'lintool/master'

Authored by cneud <clemens.neudecker@gmail.com> on Mar 18 2014, 22:36.

Description

Merge remote-tracking branch 'lintool/master'

Conflicts:
README.md
pom.xml

Event Timeline

cneud <clemens.neudecker@gmail.com> committed R1473:232a07ac56c9: Merge remote-tracking branch 'lintool/master' (authored by cneud <clemens.neudecker@gmail.com>).Mar 18 2014, 22:36

Merged Changes

CommitAuthorDetailsCommitted
53fcae412c25lintool
Fixed Issues #5 and #6 
Mar 17 2014
303860c9ae3blintool
Reformatting source. 
Mar 17 2014
b83b898c782clintool
Merge branch 'jar_upgrade' into disable_wal 
Mar 17 2014
c52474128b38lintool
Merge branch 'disable_wal' of github.com:lintool/warcbase into disable_wal 
Mar 17 2014
d543a4957916lintool
Merge branch 'master' into disable_wal 
Mar 17 2014
b430dc7c94f6lintool
Merge branch 'jar_upgrade' into disable_wal 
Mar 17 2014
8c649e5336aflintool
Fixed Issue #7 
Mar 17 2014
48ac86cd8479lintool
Added log4j properties. 
Mar 17 2014
a33f92f340e1lintool
Added try/catch block in ingestion code. 
Mar 17 2014
5ae6b8841cbelintool
Merge branch 'working' 
Mar 17 2014
53aacb335403Jeffyrao
code reformat via eclipse imported project 
Mar 17 2014
987f9518ebb8lintool
Ignores all files that aren't WARC/ARC files in ingest. 
Mar 16 2014
dfb63a169b43lintool
Tried disabling WAL to see impact on performance. 
Mar 16 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
19e2ff05074alintool
openwayback-core pulls in hadoop-core; excludes 
Mar 16 2014
073fd3206185lintool
Simplified Maven dependencies; Moved from IA artifacts to openwayback artifacts. 
Mar 16 2014
228ca87cd0c3lintool
Light refactoring. 
Mar 16 2014
c8577eac7bbblintool
Upgraded to CDH 4.4 jars for HBase and ZK. 
Mar 16 2014
19453fc7ac8flintool
whitespace 
Mar 16 2014
1e0783ff8a6clintool
Merge branch 'new_hbase_structure' of https://github.com/milad621/warcbase into… 
Mar 16 2014
267f165ba113lintool
Merge branch 'working' 
Mar 16 2014
854e5d13f12clintool
Update README. 
Mar 16 2014
7a93263997f3lintool
More POM tweaks to get MR jobs running correctly. 
Mar 16 2014
2f51acbc5fbelintool
Tweaked POM 
Mar 15 2014
fdb75decbdf4lintool
Whitespace. 
Mar 15 2014
d86dcb73c854lintool
Merge branch 'extract-links' of https://github.com/Jeffyrao/warcbase into… 
Mar 15 2014
5d382f5fb4f7Jeffyrao
Update README.md 
Jan 4 2014
142082d20eecJeffyrao
Update README.md 
Jan 4 2014
75a0820c382emilad621
servlet updated with the new hbase structure. 
Dec 28 2013
a80e87ca6f74milad621
new hbase structure for ingest files 
Dec 11 2013
3c1f4ccccc0cJinfeng Rao
modify UriMappingBuilder in pom.xml 
Dec 9 2013
8a3cb8c12dcaJinfeng Rao
build hadoop job using Maven Assembly Plugin, modified pom.xml, added hadoop… 
Dec 8 2013
2b49ec425597Jeffyrao
check text/html type and modify Jsoup.parse charset as ISO-8859-1 
Dec 8 2013
2e7e0cb81775Jeffyrao
modify UriMappingBuilder to read all files under given directory 
Dec 7 2013
c4248d61b8b7lintool
Simple MapReduce program to count number of unique URLs. 
Dec 7 2013
8e1cadb7e70eJeffyrao
Extract links and Lucene FST for URLs. 
Dec 6 2013
bbee2e38f787milad621
removed dead code 
Dec 5 2013
19735bbbbd86milad621
Started a new branch to extract text from warcbase data and organize the data… 
Dec 1 2013
944b138ee0d2milad621
started a new branch to extract text from warcbase data and organize the data… 
Dec 1 2013
1bc2ea63e470milad621
Merge remote-tracking branch 'forkOrigin/master' 
Nov 24 2013
7e76e19f2547milad621
PrintAllUris add to appassembler which will output a urls.html file with all… 
Nov 23 2013