Author: kwright
Date: Fri Jan 17 11:34:50 2014
New Revision: 1559076
URL: http://svn.apache.org/r1559076
Log:
Pull up fix for CONNECTORS-861 from trunk
Modified:
manifoldcf/branches/release-1.5-branch/ (props changed)
manifoldcf/branches/release-1.5-branch/CHANGES.txt
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/properties-global.xml
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1559075
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1559076&r1=1559075&r2=1559076&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Fri Jan 17 11:34:50 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.5 =====================
+CONNECTORS-861: Reduce the example worker thread count so that we
+don't run out of zookeeper resources on Windows.
+(Karl Wright)
+
CONNECTORS-860: Remove zookeeper.jar from a number of contexts
where it should not be. This will reduce the binary footprint by some
amount and also prevent more than one zookeeper.jar from being in
Modified:
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/properties-global.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/properties-global.xml?rev=1559076&r1=1559075&r2=1559076&view=diff
==============================================================================
---
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/properties-global.xml
(original)
+++
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/properties-global.xml
Fri Jan 17 11:34:50 2014
@@ -27,6 +27,6 @@
<property name="org.apache.manifoldcf.dbsuperusername" value="sa"/>
<property name="org.apache.manifoldcf.dbsuperuserpassword" value=""/>
<property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
- <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
+ <property name="org.apache.manifoldcf.crawler.threads" value="20"/>
<!-- Any additional global properties go here -->
</configuration>
