Changes to 'dev/deduplicate'

Mon Jan 12 17:29:56 CET 2015

New branch 'dev/deduplicate' available with the following commits:
commit dc58d17bb8764ec9c1348c8534cb670bcbd7e6f7
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Jan 12 11:15:56 2015 -0500

    Deduplicate kolab objects in cache (#4067)
    
    It may happen (by an error) that kolab folder contains more than one object
    with the same UID. This change will make sure the cache contains
    only the most recent instance of the object. Also, all outdated instances
    will be automatically marked as deleted.
    
    Note: There's no conflict resolving.