[CalendarServer-changes] [14007] CalendarServer/branches/release/CalendarServer-6.0-dev

[source_changes at macosforge.org]

Revision: 14007
          http://trac.calendarserver.org//changeset/14007
Author:   cdaboo at apple.com
Date:     2014-09-24 19:27:05 -0700 (Wed, 24 Sep 2014)
Log Message:
-----------
Group attendee expansion disabled.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-6.0-dev/conf/caldavd-test.plist
    CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt
    CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/stdconfig.py
    CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/test/test_sql.py

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/conf/caldavd-test.plist
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/conf/caldavd-test.plist	2014-09-25 02:24:53 UTC (rev 14006)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/conf/caldavd-test.plist	2014-09-25 02:27:05 UTC (rev 14007)
@@ -892,7 +892,7 @@
     <key>GroupAttendees</key>
     <dict>
       <key>Enabled</key>
-      <true/>
+      <false/>
 
       <key>ReconciliationDelaySeconds</key>
       <integer>5</integer>

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt	2014-09-25 02:24:53 UTC (rev 14006)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt	2014-09-25 02:27:05 UTC (rev 14007)
@@ -7,4 +7,4 @@
 mockldap
 q
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/branches/release/CalDAVTester-6.0@14001-dev#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/branches/release/CalDAVTester-6.0@14006-dev#egg=CalDAVTester

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/stdconfig.py	2014-09-25 02:24:53 UTC (rev 14006)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/stdconfig.py	2014-09-25 02:27:05 UTC (rev 14007)
@@ -972,7 +972,7 @@
     },
 
     "GroupAttendees" : {
-        "Enabled": True,
+        "Enabled": False,
         "ReconciliationDelaySeconds" : 5,
         "AutoUpdateSecondsFromNow" : 60 * 60,   # 1 hour
     },

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/test/test_sql.py	2014-09-25 02:24:53 UTC (rev 14006)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/test/test_sql.py	2014-09-25 02:27:05 UTC (rev 14007)
@@ -7800,7 +7800,9 @@
             "now2": now2,
         }
 
+        self.patch(config.GroupAttendees, "Enabled", True)
 
+
     @inlineCallbacks
     def populate(self):
         yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140924/4a6ad841/attachment-0001.html>