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

[source_changes at macosforge.org]

Revision: 8705
          http://trac.macosforge.org/projects/calendarserver/changeset/8705
Author:   glyph at apple.com
Date:     2012-02-16 04:29:17 -0800 (Thu, 16 Feb 2012)
Log Message:
-----------
Configuration option for merging during upgrading.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/migrate-merge/twistedcaldav/stdconfig.py

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

Modified: CalendarServer/branches/users/glyph/migrate-merge/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/branches/users/glyph/migrate-merge/twistedcaldav/stdconfig.py	2012-02-16 12:29:14 UTC (rev 8704)
+++ CalendarServer/branches/users/glyph/migrate-merge/twistedcaldav/stdconfig.py	2012-02-16 12:29:17 UTC (rev 8705)
@@ -550,6 +550,11 @@
                                    # the future, hopefully all relevant
                                    # upgrades - in parallel in subprocesses.
 
+    "MergeUpgrades": False, # During the upgrade phase of startup, rather than
+                            # skipping homes found both on the filesystem and in
+                            # the database, merge the data from the filesystem
+                            # into the database homes.
+
     "EnableDefaultAlarms" : True, # Support for default alarms generated by the server
 
     # CardDAV Features
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120216/7733a270/attachment-0001.html>