resolve conflicts
bc47be0fea19
Actions

Authored by Jeffyrao <raojinfeng@gmail.com> on Aug 13 2014, 06:26.

Description

resolve conflicts

Committed

Jeffyrao <raojinfeng@gmail.com>

Aug 13 2014, 06:26

Pushed

dportabella

Oct 19 2016, 16:29

Parents

Branches

Unknown

Tags

Unknown

Jeffyrao <raojinfeng@gmail.com> committed R1473:bc47be0fea19: resolve conflicts (authored by Jeffyrao <raojinfeng@gmail.com>).Aug 13 2014, 06:26

Commit	Author	Details	Committed
0623b52cd05c	Jeffyrao	reformat code	Aug 13 2014
65c6e54a948e	Jeffyrao	add UriMappingBuilder Mapreduce version	Aug 4 2014
59aa95aab857	Jeffyrao	fix the bug of selecting webpage by date ineffective	Jul 25 2014
7175239e0751	Jeffyrao	add Hadoop/HBase input choice for ExtractLinks and ExtractSiteLinks classes	Jul 22 2014

				Path
	M			src/main/java/org/warcbase/analysis/graph/ExtractLinks.java
	M			src/main/java/org/warcbase/analysis/graph/ExtractSiteLinks.java
	M			src/main/java/org/warcbase/analysis/graph/InvertAnchorText.java
	A			src/main/java/org/warcbase/analysis/graph/PrefixMapping.java
	V			src/main/java/org/warcbase/data/{UriMapping.java ← UrlMapping.java}
	V			src/main/java/org/warcbase/data/{UriMappingBuilder.java ← UrlMappingBuilder.java}
	A			src/main/java/org/warcbase/data/UriMappingMapReduceBuilder.java
	V			src/main/java/org/warcbase/data/{UrlMapping.java → UriMapping.java}
	V			src/main/java/org/warcbase/data/{UrlMappingBuilder.java → UriMappingBuilder.java}
	M			src/test/java/org/warcbase/data/UriMappingTest.java