Author: kwright
Date: Sun Jan 19 17:26:04 2014
New Revision: 1559532
URL: http://svn.apache.org/r1559532
Log:
Pull up fix for CONNECTORS-863 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/zookeeper.cfg
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1559530
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1559532&r1=1559531&r2=1559532&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Sun Jan 19 17:26:04 2014
@@ -3,6 +3,10 @@ $Id$
======================= Release 1.5 =====================
+CONNECTORS-863: Increase the number of zookeeper connections allowed;
+this permits agents processes to start on linux.
+(Karl Wright)
+
CONNECTORS-862: Reduce the binary image footprint by consolidating the
various lib directories and just changing classpaths.
(Karl Wright)
Modified:
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/zookeeper.cfg
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/zookeeper.cfg?rev=1559532&r1=1559531&r2=1559532&view=diff
==============================================================================
---
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/zookeeper.cfg
(original)
+++
manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-zk-common/zookeeper.cfg
Sun Jan 19 17:26:04 2014
@@ -16,3 +16,4 @@
tickTime=2000
dataDir=zookeeper
clientPort=8349
+maxClientCnxns=300
