tree 493cdc7047a3baa9ae36f660d98d08ded9f765d0
parent 8a23201eed654167d64601d439949bdc77944721
author Raja Daoud <rdaoud@google.com> 1400621574 -0700
committer Raja Daoud <rdaoud@google.com> 1400621579 -0700

Change the default conflict resolution policy.

* The default conflict resolution policy now picks the most recent
  of the two conflicting mutations.  A UTC timestamp is added to
  each mutation when it reached syncd, and is used to select the
  winner of a conflict.  The mutation version numbers are now used
  as a tie-breaker when the two mutations have the same timestamp.

* Change the default peerSyncInterval to 100ms.  For testing, add
  a command-line arg to override this value.

Change-Id: Ie1263afb85cecf65873fb41054c424044401974b