This is an automated email from the ASF dual-hosted git repository.
snagel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nutch.git
commit f046e632e6c0999ed599681e3116712c71d77add
Merge: 25d0cf7 5dcd7b1
Author: Sebastian Nagel <sna...@apache.org>
AuthorDate: Thu Apr 6 11:58:59 2017 +0200
Merge branch 'sebastian-nagel/nutch:NUTCH-2281', fixes NUTCH-2281, closes
#119
src/java/org/apache/nutch/crawl/CrawlDb.java | 62 +++++++++++-----------
src/java/org/apache/nutch/crawl/CrawlDbMerger.java | 27 ++++++----
src/java/org/apache/nutch/crawl/CrawlDbReader.java | 10 ++--
.../org/apache/nutch/crawl/DeduplicationJob.java | 2 +-
src/java/org/apache/nutch/crawl/Generator.java | 23 ++++----
src/java/org/apache/nutch/crawl/Injector.java | 7 ++-
src/java/org/apache/nutch/crawl/LinkDb.java | 19 +++----
src/java/org/apache/nutch/crawl/LinkDbMerger.java | 6 +--
src/java/org/apache/nutch/crawl/LinkDbReader.java | 2 +-
src/java/org/apache/nutch/hostdb/UpdateHostDb.java | 2 +-
.../org/apache/nutch/indexer/IndexerMapReduce.java | 2 +-
src/java/org/apache/nutch/indexer/IndexingJob.java | 2 +-
src/java/org/apache/nutch/parse/ParseSegment.java | 10 ++--
.../apache/nutch/scoring/webgraph/LinkDumper.java | 4 +-
.../apache/nutch/scoring/webgraph/LinkRank.java | 2 +-
.../apache/nutch/scoring/webgraph/NodeReader.java | 3 +-
.../nutch/scoring/webgraph/ScoreUpdater.java | 2 +-
.../apache/nutch/scoring/webgraph/WebGraph.java | 7 +--
.../org/apache/nutch/segment/SegmentMerger.java | 7 +--
.../org/apache/nutch/segment/SegmentReader.java | 28 +++-------
.../apache/nutch/tools/CommonCrawlDataDumper.java | 4 +-
src/java/org/apache/nutch/tools/FileDumper.java | 1 -
src/java/org/apache/nutch/util/LockUtil.java | 43 +++++++++++++++
23 files changed, 157 insertions(+), 118 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@nutch.apache.org" <commits@nutch.apache.org>.
