Fix Version/s: None
In the latest
CASSANDRA-580 patch the timestamp used for conflict resolution has been replaced by a Clock object that can contain either timestamp or a context byte array. That change allows for other conflict resolution techniques to be used.
The change can be broken out and submitted here in order to make
CASSANDRA-580 more manageable.