DESCRIPTION

CBQE:2686 Add tests for conflict resolution and adjusted time

Change-Id: Id83dc48a1d1e04230f1746f14488f4bdc5cb9d03


COMMENTS

author: Ezekiel Beck
date: 2015-03-17 23:33:54.849000000

Uploaded patch set 4.

-------------------------------------
author: Hugo Blankenship
date: 2015-03-17 23:34:02.323000000

Patch Set 4:

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

-------------------------------------
author: Titus Ho
date: 2015-03-17 23:46:01.142000000

Patch Set 4: Code-Review+2

-------------------------------------
author: Hugo Blankenship
date: 2015-03-18 00:05:08.138000000

Patch Set 4: Verified+1

Build Successful 

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

-------------------------------------
author: Ezekiel Beck
date: 2015-03-18 16:09:21.506000000

Patch Set 5: Patch Set 4 was rebased

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

Change has been successfully cherry-picked as 8514bc0dcf8db8fa65f853588f747d083b572282

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