DESCRIPTION

CBQE:2686 Add tests for conflict resolution and adjusted time

Change-Id: Id83dc48a1d1e04230f1746f14488f4bdc5cb9d03


COMMENTS

author: Hugo Blankenship
date: 2015-03-17 23:28:32.255000000

Patch Set 3:

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

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

Patch Set 3: Verified-1

Build Failed 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/4454/ : ABORTED

Make encountered an error building one or more targets. ( http://factory.couchbase.com//job/testrunner-Jasmin Rangel-sherlock/4454/ )

need to update, install, or configure build tools, environment variables, ssh credentials (requires no code change) ( http://factory.couchbase.com//job/testrunner-Jasmin Rangel-sherlock/4454/ )

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

Change has been successfully cherry-picked as 8514bc0dcf8db8fa65f853588f747d083b572282

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