Description
The fix of MB-8825 at ep_engine side modified the resolution algorithm for deletion. Now for deletion, we only compare Seqno and CAS.
Since we provide an option to do local conflict resolution for backward compatibility, we also need to change the XDCR side resolution algorithm to be consistent with ep_engine side change.
The bottom line is, resolution algorithm should be the same regardless of the location where we do conflict resolution.
Attachments
For Gerrit Dashboard: MB-8905 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
28405,6 | MB-8905: modify resolution algorithm for deletion in XMEM | 2.2.0 | ns_server | Status: MERGED | +2 | +1 |
28527,1 | Merge remote-tracking branch 'couchbase/2.2.0' | master | ns_server | Status: MERGED | +2 | +1 |