fix conflicts in CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/044e8e77 Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/044e8e77 Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/044e8e77 Branch: refs/heads/master Commit: 044e8e77e015df051d0345927eca4fa5f38527fd Parents: d6bcefd f529359 Author: Chris Mattmann <[email protected]> Authored: Sun Apr 17 15:35:33 2016 -0700 Committer: Chris Mattmann <[email protected]> Committed: Sun Apr 17 15:35:33 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 + build.xml | 6 + conf/nutch-default.xml | 82 +++-- default.properties | 3 +- src/plugin/build.xml | 4 + src/plugin/lib-htmlunit/build-ivy.xml | 54 +++ src/plugin/lib-htmlunit/build.xml | 28 ++ src/plugin/lib-htmlunit/ivy.xml | 52 +++ src/plugin/lib-htmlunit/plugin.xml | 166 +++++++++ .../protocol/htmlunit/HtmlUnitWebDriver.java | 189 ++++++++++ .../htmlunit/HtmlUnitWebWindowListener.java | 53 +++ .../nutch/protocol/selenium/HttpWebClient.java | 37 +- src/plugin/protocol-htmlunit/build.xml | 46 +++ src/plugin/protocol-htmlunit/ivy.xml | 38 ++ src/plugin/protocol-htmlunit/plugin.xml | 51 +++ .../apache/nutch/protocol/htmlunit/Http.java | 63 ++++ .../nutch/protocol/htmlunit/HttpResponse.java | 347 +++++++++++++++++++ .../apache/nutch/protocol/htmlunit/package.html | 21 ++ 18 files changed, 1197 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nutch/blob/044e8e77/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a3bde42,1f48eb6..e14d7c5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -10,10 -10,8 +10,12 @@@ in the release announcement and keep i Nutch Change Log +* NUTCH-2250 CommonCrawlDumper : Invalid format and skipped parts (Thamme Gowda N.,lewismc via mattmann) + +* NUTCH-2245 Developed the NGram Model on the existing Unigram Cosine Similarity Model (bhavyasanghavi via sujen) + + * NUTCH-2191 Add HtmlUnit plugin in Nutch. (karanjeets and markus17 via mattmann) + * NUTCH-2241 Unstable Selenium plugin in Nutch. Fixed bugs and enhanced configuration (karanjeets via mattmann) * NUTCH-2213 CommonCrawlDataDumper saves gzipped body in extracted form (jnioche via mattmann) http://git-wip-us.apache.org/repos/asf/nutch/blob/044e8e77/conf/nutch-default.xml ----------------------------------------------------------------------
