tree b3be85fb6d1df547febfc35375260fb373ae0765
parent e37893a01a52d95e13bfaa0692222b546b6475f1
author Fred Quintana <fredq@google.com> 1465321811 -0700
committer Fred Quintana <fredq@google.com> 1465326637 +0000

add timestamp to joiners and implement syngroup resolve

This CL adds syncgroup resolve and tests and also
changes the Joiner list to also include a timestamp and
a tombstone flag for each joiner and to use that when
performing conflict resolution.

Change-Id: I9ed80c008550480e962baca164aca54311b4ed54