svn commit: r1358264 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/example/ solr/example/solr/solr.xml

[ma...@apache.org]

Author: markrmiller
Date: Fri Jul  6 15:29:25 2012
New Revision: 1358264

URL: http://svn.apache.org/viewvc?rev=1358264&view=rev
Log:
merge back r1358262 SOLR-3599: Add zkClientTimeout to solr.xml so that it's obvious how to change it and so that you can change it with a system property.

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/example/   (props changed)
    lucene/dev/branches/branch_4x/solr/example/solr/solr.xml

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1358264&r1=1358263&r2=1358264&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jul  6 15:29:25 2012
@@ -66,6 +66,9 @@ Other Changes
 * SOLR-3563: Unloading all cores in a SolrCloud collection will now cause the removal of
   that collection's meta data from ZooKeeper. (Mark Miller, Per Steffensen)
 
+* SOLR-3599: Add zkClientTimeout to solr.xml so that it's obvious how to change it and so 
+  that you can change it with a system property. (Mark Miller)
+
 ==================  4.0.0-ALPHA ==================
 More information about this release, including any errata related to the 
 release notes, upgrade instructions, or other changes may be found online at:

Modified: lucene/dev/branches/branch_4x/solr/example/solr/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/solr.xml?rev=1358264&r1=1358263&r2=1358264&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/solr.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/solr.xml Fri Jul  6 15:29:25 2012
@@ -42,8 +42,12 @@
   <!--
   adminPath: RequestHandler path to manage cores.  
     If 'null' (or absent), cores will not be manageable via request handler
+  defaultCoreName: (optional) core to use when no core name is specified in an access url
+    
+  All of the attributes in cores after defaultCoreName only apply when running in SolrCloud mode.
+  You can read more about SolrCloud mode at http://wiki.apache.org/solr/SolrCloud
   -->
-  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="${host:}" hostPort="${jetty.port:}">
+  <cores adminPath="/admin/cores" defaultCoreName="collection1" host="${host:}" hostPort="${jetty.port:}" zkClientTimeout="${zkClientTimeout:10000}">
     <core name="collection1" instanceDir="collection1" />
   </cores>
 </solr>