Author: markus
Date: Thu Dec 27 12:34:27 2012
New Revision: 1426180
URL: http://svn.apache.org/viewvc?rev=1426180&view=rev
Log:
NUTCH-1510 Upgrade to Hadoop 1.1.1
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/ivy/ivy.xml
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1426180&r1=1426179&r2=1426180&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Thu Dec 27 12:34:27 2012
@@ -2,6 +2,8 @@ Nutch Change Log
Release 2.2 - Current Development
+* NUTCH-1510 Upgrade to Hadoop 1.1.1 (markus)
+
* NUTCH-1503 Configuration properties not in sync between FetcherReducer and
nutch-default.xml (snagel + lewismc)
* NUTCH-1394 backport NUTCH-1232 Remove site field from index-basic (lewismc)
Modified: nutch/branches/2.x/ivy/ivy.xml
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/ivy/ivy.xml?rev=1426180&r1=1426179&r2=1426180&view=diff
==============================================================================
--- nutch/branches/2.x/ivy/ivy.xml (original)
+++ nutch/branches/2.x/ivy/ivy.xml Thu Dec 27 12:34:27 2012
@@ -50,7 +50,7 @@
conf="*->default" />
<dependency org="org.apache.hadoop" name="hadoop-core"
- rev="1.0.3" conf="*->default">
+ rev="1.1.1" conf="*->default">
<exclude org="net.sf.kosmosfs" name="kfs" />
<exclude org="net.java.dev.jets3t" name="jets3t" />
<exclude org="org.eclipse.jdt" name="core" />
@@ -78,7 +78,7 @@
<!--artifacts needed for testing -->
<dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
- <dependency org="org.apache.hadoop" name="hadoop-test" rev="1.0.3"
conf="test->default">
+ <dependency org="org.apache.hadoop" name="hadoop-test" rev="1.1.1"
conf="test->default">
<exclude org="net.sf.kosmosfs" name="kfs" />
<exclude org="net.java.dev.jets3t" name="jets3t" />
<exclude org="org.eclipse.jdt" name="core" />