lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1566486 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Date Mon, 10 Feb 2014 01:05:48 GMT
Author: markrmiller
Date: Mon Feb 10 01:05:48 2014
New Revision: 1566486

URL: http://svn.apache.org/r1566486
Log:
SOLR-5585: Raise Collections API timeout to 3 minutes from one minute.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1566486&r1=1566485&r2=1566486&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Feb 10 01:05:48 2014
@@ -357,6 +357,9 @@ Other Changes
 * SOLR-5700: Improve error handling of remote queries (proxied requests).
   (Greg Chanan, Steve Davids via Mark Miller)
 
+* SOLR-5585: Raise Collections API timeout to 3 minutes from one minute.
+  (Mark Miller)
+
 ==================  4.6.1  ==================
 
 Versions of Major Components

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java?rev=1566486&r1=1566485&r2=1566486&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
Mon Feb 10 01:05:48 2014
@@ -226,7 +226,7 @@ public class CollectionsHandler extends 
     handleResponse(action.toString().toLowerCase(Locale.ROOT), m, rsp);
   }
 
-  public static long DEFAULT_ZK_TIMEOUT = 60*1000;
+  public static long DEFAULT_ZK_TIMEOUT = 180*1000;
 
   private void handleResponse(String operation, ZkNodeProps m,
                               SolrQueryResponse rsp) throws KeeperException, InterruptedException
{



Mime
View raw message