DESCRIPTION

CBQE:2686 Add tests for conflict resolution and adjusted time

Change-Id: Id83dc48a1d1e04230f1746f14488f4bdc5cb9d03


COMMENTS

author: Ezekiel Beck
date: 2015-03-17 22:39:06.893000000

Uploaded patch set 2.

-------------------------------------
author: Hugo Blankenship
date: 2015-03-17 22:39:12.798000000

Patch Set 2:

Build Started http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/4453/

-------------------------------------
author: Hugo Blankenship
date: 2015-03-17 23:09:20.621000000

Patch Set 2: Verified+1

Build Successful 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/4453/ : SUCCESS

-------------------------------------
author: Ezekiel Beck
date: 2015-03-17 23:28:28.152000000

Patch Set 3: Patch Set 2 was rebased

-------------------------------------
author: Tate Garrett
date: 2015-03-18 16:21:28.088000000

Change has been successfully cherry-picked as 8514bc0dcf8db8fa65f853588f747d083b572282

-------------------------------------
