Homec4science

Merge branch 'master' into pyspark

Authored by lintool <jimmylin@umd.edu> on Jun 14 2015, 18:46.

Description

Merge branch 'master' into pyspark

Details

Committed
lintool <jimmylin@umd.edu>Jun 14 2015, 18:46
Pushed
dportabellaOct 19 2016, 16:29
Parents
R1473:40d0d3d8a9fc: Fixed issue #135
R1473:7c1ebde17fb4: Better integration of ARC readers in pyspark.
Branches
Unknown
Tags
Unknown

Event Timeline

lintool <jimmylin@umd.edu> committed R1473:c9f27489b093: Merge branch 'master' into pyspark (authored by lintool <jimmylin@umd.edu>).Jun 14 2015, 18:46

Merged Changes

CommitAuthorDetailsCommitted
40d0d3d8a9fclintool
Fixed issue #135 
Jun 9 2015
988a2354d84dlintool
Fixed merge conflict that got committed to master accidentally. 
Jun 9 2015
86d5ec617e52lintool
Fixed issues #119, #122, #130, #131 
Jun 9 2015
bbe29b4ad65dianmilligan1
Merge branch 'jrwiebe-master' 
Jun 9 2015
51abf7e86696ianmilligan1
testing fork 
Jun 9 2015
7cb0c2e8d2ccJeremy Wiebe
added Python scripts dir 
Jun 9 2015
61ca00e10cb2lintool
Fixed issues #126, #127, #128 
Jun 7 2015
2f462979da0dlintool
Removed JWAT jars. 
Jun 7 2015
9b8e85db50e3lintool
removed JWAT testcase. 
Jun 7 2015
d9b553c76cedlintool
Removed JWAT; removed unneeded files in org.warcbase.analysis; switched… 
Jun 7 2015
caf87fbecf45lintool
Added schema metadata in loader. 
Jun 7 2015
49fc639ae5b6lintool
Merge branch 'pig-warc' of github.com:lintool/warcbase into pig-warc 
Jun 7 2015
195f4af7474elintool
revamped tests. 
Jun 7 2015
1f9d853f38a2lintool
better trapping of errors. 
Jun 7 2015
84ebe4f68bbdlintool
Added test case for PigWarcLoader. 
Jun 6 2015
13619567667flintool
Changed over to WacWarcInputFormatTest as the underlying InputFormat. 
Jun 6 2015
1c013a7b064fJeremy Wiebe
Added Stanford NER UDF 
May 26 2015
bb394dbc81cfJeremy Wiebe
Merge remote-tracking branch 'upstream/master' 
May 26 2015
451322ac2cf8Jeremy Wiebe
Update README.OSX.md 
Jan 27 2015
4dc290c46b7ajrwiebe
Create README.OSX.md 
Jan 21 2015