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

[source_changes at macosforge.org]

Revision: 14002
          http://trac.calendarserver.org//changeset/14002
Author:   cdaboo at apple.com
Date:     2014-09-24 14:01:06 -0700 (Wed, 24 Sep 2014)
Log Message:
-----------
Sharing calendars with groups is 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-24 20:58:37 UTC (rev 14001)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/conf/caldavd-test.plist	2014-09-24 21:01:06 UTC (rev 14002)
@@ -792,7 +792,7 @@
     	<key>Groups</key>
     	<dict>
 	    	<key>Enabled</key>
-	    	<true/>
+	    	<false/>
     	</dict>
       </dict>
       <key>AddressBooks</key>

Modified: CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt	2014-09-24 20:58:37 UTC (rev 14001)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/requirements-dev.txt	2014-09-24 21:01:06 UTC (rev 14002)
@@ -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/trunk@13956#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/branches/release/CalDAVTester-6.0@14001-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-24 20:58:37 UTC (rev 14001)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/twistedcaldav/stdconfig.py	2014-09-24 21:01:06 UTC (rev 14002)
@@ -528,7 +528,7 @@
                 ],
             },
             "Groups" : {
-                "Enabled"     : True, # Calendar sharing to groups on/off switch
+                "Enabled"     : False, # Calendar sharing to groups on/off switch
                 "ReconciliationDelaySeconds" : 5,
             },
         },

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-24 20:58:37 UTC (rev 14001)
+++ CalendarServer/branches/release/CalendarServer-6.0-dev/txdav/caldav/datastore/test/test_sql.py	2014-09-24 21:01:06 UTC (rev 14002)
@@ -1010,7 +1010,7 @@
 
         @inlineCallbacks
         def _defer2():
-            yield cal2.directShareWithUser("uid1")
+            yield cal2.directShareWithUser("uid2")
             yield txn2.commit()
         d2 = _defer2()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140924/7851ef90/attachment-0001.html>