[CalendarServer-changes] [8710] CalendarServer/branches/users/glyph/migrate-merge

source_changes at macosforge.org source_changes at macosforge.org
Thu Feb 16 04:29:32 PST 2012


Revision: 8710
          http://trac.macosforge.org/projects/calendarserver/changeset/8710
Author:   glyph at apple.com
Date:     2012-02-16 04:29:32 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
honor config option

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/calendarserver/tap/caldav.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/migrate-merge/

Modified: CalendarServer/branches/users/glyph/migrate-merge/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/calendarserver/tap/caldav.py	2012-02-16 12:29:29 UTC (rev 8709)
+++ CalendarServer/branches/users/glyph/migrate-merge/calendarserver/tap/caldav.py	2012-02-16 12:29:32 UTC (rev 8710)
@@ -927,7 +927,7 @@
                                 CachingFilePath(config.DocumentRoot),
                                 PostDBImportService(config, store, mainService),
                                 store, uid=overrideUID, gid=overrideGID,
-                                spawner=spawner,
+                                spawner=spawner, merge=config.MergeUpgrades,
                                 parallel=parallel
                             ),
                             store, uid=overrideUID, gid=overrideGID,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/e11676aa/attachment-0001.html>


More information about the calendarserver-changes mailing list