Pull up fix for CONNECTORS-861 from trunk
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/release-1.5-branch@1559076 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b57718..36ac4d2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,10 @@
======================= 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
diff --git a/framework/example-multiprocess-zk-common/properties-global.xml b/framework/example-multiprocess-zk-common/properties-global.xml
index dfddb35..0401a1d 100644
--- a/framework/example-multiprocess-zk-common/properties-global.xml
+++ b/framework/example-multiprocess-zk-common/properties-global.xml
@@ -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>
