[CalendarServer-changes] [4735] CalendarServer/branches/users/cdaboo/deployment-partition-4722/ twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 4735
          http://trac.macosforge.org/projects/calendarserver/changeset/4735
Author:   cdaboo at apple.com
Date:     2009-11-10 13:23:42 -0800 (Tue, 10 Nov 2009)
Log Message:
-----------
Fix merge.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/appleopendirectory.py	2009-11-10 21:02:48 UTC (rev 4734)
+++ CalendarServer/branches/users/cdaboo/deployment-partition-4722/twistedcaldav/directory/appleopendirectory.py	2009-11-10 21:23:42 UTC (rev 4735)
@@ -226,7 +226,7 @@
     def _getMemcacheClient(self, refresh=False):
         if refresh or not hasattr(self, "memcacheClient"):
             self.memcacheClient = memcacheclient.ClientFactory.getClient(['%s:%s' %
-                (config.Memcached.BindAddress, config.Memcached.Port)],
+                (config.Memcached.Pools.Default.BindAddress, config.Memcached.Pools.Default.Port)],
                 debug=0, pickleProtocol=2)
         return self.memcacheClient
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091110/0097f6d0/attachment.html>