You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2011/11/03 15:40:27 UTC

svn commit: r1197159 - in /lucene/dev/branches/branch_3x/solr: ./ client/ruby/solr-ruby/solr/conf/ client/ruby/solr-ruby/test/conf/ contrib/clustering/src/test-files/clustering/solr/conf/ contrib/dataimporthandler-extras/src/test-files/dihextras/solr/c...

Author: mvg
Date: Thu Nov  3 14:40:25 2011
New Revision: 1197159

URL: http://svn.apache.org/viewvc?rev=1197159&view=rev
Log:
SOLR-2591: Remove commitLockTimeout option from solrconfig.xml

Modified:
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-duh-optimize.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master1.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master2.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig_perf.xml
    lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/crazy-path-to-config.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
    lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Thu Nov  3 14:40:25 2011
@@ -140,6 +140,8 @@ Bug Fixes
   extension is used. Fixed solr. impl. of IResource and IResourceLookup. (Dawid Weiss)
 
 * SOLR-2849: Fix dependencies in Maven POMs. (David Smiley via Steve Rowe)
+
+* SOLR-2591: Remove commitLockTimeout option from solrconfig.xml (Luca Cavanna via Martijn van Groningen)
   
 ==================  3.4.0  ==================
 

Modified: lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -39,7 +39,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
   </indexDefaults>
 
   <mainIndex>

Modified: lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/client/ruby/solr-ruby/test/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -41,7 +41,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
   </indexDefaults>
 
   <mainIndex>

Modified: lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/clustering/src/test-files/clustering/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/conf/dataimport-solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert: Turn on Lucene's auto commit capability.

Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/contentstream-solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-nodatasource-solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/dataimporthandler/src/test-files/dih/solr/conf/dataimport-solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/extraction/src/test-files/extraction/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -50,7 +50,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -72,7 +71,6 @@
     <mergeScheduler>org.apache.lucene.index.ConcurrentMergeScheduler</mergeScheduler>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test-files/uima/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -96,7 +96,6 @@
     <!-- <maxMergeDocs>2147483647</maxMergeDocs> -->
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
       Expert: Turn on Lucene's auto commit capability. This causes

Modified: lucene/dev/branches/branch_3x/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/velocity/src/test-files/velocity/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -38,7 +38,6 @@
     <ramBufferSizeMB>32</ramBufferSizeMB>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
     <lockType>native</lockType>
   </indexDefaults>
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Thu Nov  3 14:40:25 2011
@@ -55,7 +55,6 @@ public class SolrIndexConfig {
     ramBufferSizeMB = 16;
     maxFieldLength = -1;
     writeLockTimeout = -1;
-    commitLockTimeout = -1;
     lockType = null;
     termIndexInterval = IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL;
     mergePolicyInfo = null;
@@ -74,7 +73,6 @@ public class SolrIndexConfig {
 
   public final int maxFieldLength;
   public final int writeLockTimeout;
-  public final int commitLockTimeout;
   public final String lockType;
   public final PluginInfo mergePolicyInfo;
   public final PluginInfo mergeSchedulerInfo;
@@ -99,7 +97,6 @@ public class SolrIndexConfig {
 
     maxFieldLength=solrConfig.getInt(prefix+"/maxFieldLength",def.maxFieldLength);
     writeLockTimeout=solrConfig.getInt(prefix+"/writeLockTimeout", def.writeLockTimeout);
-    commitLockTimeout=solrConfig.getInt(prefix+"/commitLockTimeout", def.commitLockTimeout);
     lockType=solrConfig.get(prefix+"/lockType", def.lockType);
 
     String str =  solrConfig.get(prefix+"/mergeScheduler/text()",null);

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml Thu Nov  3 14:40:25 2011
@@ -55,7 +55,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -77,7 +76,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml Thu Nov  3 14:40:25 2011
@@ -56,7 +56,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -78,7 +77,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml Thu Nov  3 14:40:25 2011
@@ -56,7 +56,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -78,7 +77,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-duh-optimize.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-duh-optimize.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-duh-optimize.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-duh-optimize.xml Thu Nov  3 14:40:25 2011
@@ -56,7 +56,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -78,7 +77,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml Thu Nov  3 14:40:25 2011
@@ -56,7 +56,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -78,7 +77,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml Thu Nov  3 14:40:25 2011
@@ -39,10 +39,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml Thu Nov  3 14:40:25 2011
@@ -48,7 +48,6 @@
 
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml Thu Nov  3 14:40:25 2011
@@ -54,7 +54,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -76,7 +75,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml Thu Nov  3 14:40:25 2011
@@ -70,7 +70,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -92,7 +91,6 @@
     <mergeScheduler>org.apache.lucene.index.SerialMergeScheduler</mergeScheduler>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master.xml Thu Nov  3 14:40:25 2011
@@ -33,11 +33,9 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master1.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master1.xml Thu Nov  3 14:40:25 2011
@@ -33,11 +33,9 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master2.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master2.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master2.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-master2.xml Thu Nov  3 14:40:25 2011
@@ -33,11 +33,9 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml Thu Nov  3 14:40:25 2011
@@ -48,7 +48,6 @@
 
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml Thu Nov  3 14:40:25 2011
@@ -70,7 +70,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -97,7 +96,6 @@
     </mergeScheduler>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml Thu Nov  3 14:40:25 2011
@@ -69,7 +69,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -95,7 +94,6 @@
     </mergeScheduler>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml Thu Nov  3 14:40:25 2011
@@ -34,10 +34,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave.xml Thu Nov  3 14:40:25 2011
@@ -33,10 +33,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml Thu Nov  3 14:40:25 2011
@@ -33,10 +33,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml Thu Nov  3 14:40:25 2011
@@ -39,10 +39,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml Thu Nov  3 14:40:25 2011
@@ -31,7 +31,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
   </indexDefaults>
 
   <mainIndex>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml Thu Nov  3 14:40:25 2011
@@ -61,7 +61,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -83,7 +82,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
     <!-- Controls how often Lucene loads terms into memory -->
     <termIndexInterval>256</termIndexInterval>
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml Thu Nov  3 14:40:25 2011
@@ -56,7 +56,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -78,7 +77,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
     <!-- Controls how often Lucene loads terms into memory -->
     <termIndexInterval>256</termIndexInterval>
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -71,7 +71,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:
@@ -93,7 +92,6 @@
     <mergeScheduler class="org.apache.lucene.index.ConcurrentMergeScheduler"/>
     <!-- these are global... can't currently override per index -->
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig_perf.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig_perf.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig_perf.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/solrconfig_perf.xml Thu Nov  3 14:40:25 2011
@@ -54,7 +54,6 @@
     <!-- <maxMergeDocs>2147483647</maxMergeDocs> -->
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
    
     <!--  To aid in advanced debugging, you may turn on IndexWriter debug logging.

Modified: lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/crazy-path-to-config.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/crazy-path-to-config.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/crazy-path-to-config.xml (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/crazy-path-to-config.xml Thu Nov  3 14:40:25 2011
@@ -32,7 +32,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
   </indexDefaults>
 
   <mainIndex>

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/db/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/mail/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -52,7 +52,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/rss/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -53,7 +53,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/example-DIH/solr/tika/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -52,7 +52,6 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!--
      Expert:

Modified: lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/example/solr/conf/solrconfig.xml Thu Nov  3 14:40:25 2011
@@ -144,7 +144,6 @@
 
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <!-- Expert: Merge Policy 
 

Modified: lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml?rev=1197159&r1=1197158&r2=1197159&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/test-files/solrj/solr/conf/solrconfig-slave1.xml Thu Nov  3 14:40:25 2011
@@ -33,10 +33,8 @@
     <maxMergeDocs>2147483647</maxMergeDocs>
     <maxFieldLength>10000</maxFieldLength>
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
 
     <lockType>single</lockType>
   </indexDefaults>