svn commit: r1420935 - in /nutch/branches/2.x: CHANGES.txt conf/nutch-default.xml

[le...@apache.org]

Author: lewismc
Date: Wed Dec 12 19:50:47 2012
New Revision: 1420935

URL: http://svn.apache.org/viewvc?rev=1420935&view=rev
Log:
NUTCH-1503 Configuration properties not in sync between FetcherReducer and nutch-default.xml

Modified:
    nutch/branches/2.x/CHANGES.txt
    nutch/branches/2.x/conf/nutch-default.xml

Modified: nutch/branches/2.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1420935&r1=1420934&r2=1420935&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Wed Dec 12 19:50:47 2012
@@ -2,7 +2,9 @@ Nutch Change Log
 
 Release 2.2 - Current Development
 
-* backport NUTCH-1232 Remove site field from index-basic (lewismc)
+* 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)
 
 * NUTCH-1370 Expose exact number of urls injected @runtime (ferdy, snagel and lewismc)
    (includes commit for NUTCH-1471 make explicit which datastore urls are injected to)

Modified: nutch/branches/2.x/conf/nutch-default.xml
URL: http://svn.apache.org/viewvc/nutch/branches/2.x/conf/nutch-default.xml?rev=1420935&r1=1420934&r2=1420935&view=diff
==============================================================================
--- nutch/branches/2.x/conf/nutch-default.xml (original)
+++ nutch/branches/2.x/conf/nutch-default.xml Wed Dec 12 19:50:47 2012
@@ -649,6 +649,13 @@
 </property>
 
 <property>
+  <name>fetcher.queue.use.host.settings</name>
+  <value>false</value>
+  <description>Allows us to optionally enable host specific queue behavior if present.
+  </description>
+</property>
+
+<property>
   <name>fetcher.verbose</name>
   <value>false</value>
   <description>If true, fetcher will log more verbosely.</description>