| commit | 5f2c702fc1f0c754f7c8007e8c3426f11a0bc258 | [log] [tgz] |
|---|---|---|
| author | Himabindu Pucha <hpucha@google.com> | Thu Jun 12 21:38:21 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Jun 12 03:52:58 2014 +0000 |
| tree | 3e7560f59551794d6a118091c3e89440e8cd88db | |
| parent | f123da817a0ad58893dec05087fe290cf436098f [diff] | |
| parent | d94c2e9cf87a5dc234533690baea0e7d966b7ead [diff] |
Merge "veyron/runtimes/google/vsync: Support conflict resolution via blessings. Blessings are captured by adding dag links. So we also provide a new type of log record (LinkRec) to communicate link addition."