Homec4science

Merge branch 'issue12' of github.com:milad621/warcbase into multi_version_cell

Authored by lintool <jimmylin@umd.edu> on Mar 25 2014, 13:37.

Description

Merge branch 'issue12' of github.com:milad621/warcbase into multi_version_cell

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

Details

Committed
lintool <jimmylin@umd.edu>Mar 25 2014, 13:37
Pushed
dportabellaOct 19 2016, 16:29
Parents
R1473:ef6650cb7bc4: fixing branches
R1473:374b6f2c2173: Adds Snappy compression.
Branches
Unknown
Tags
Unknown

Event Timeline

lintool <jimmylin@umd.edu> committed R1473:72b9558b3ca5: Merge branch 'issue12' of github.com:milad621/warcbase into multi_version_cell (authored by lintool <jimmylin@umd.edu>).Mar 25 2014, 13:37

Merged Changes

CommitAuthorDetailsCommitted
ef6650cb7bc4milad621
fixing branches 
Mar 25 2014
0d43c98ee177milad621
Fixed issue12 and some issues with dates in browser. 
Mar 25 2014
6c48ce81ee80milad621
Issue12 fixed 
Mar 24 2014
e0d6be1055f4milad621
test push 
Mar 24 2014
252eb87988b1milad621
issue12 fixed 
Mar 24 2014