DESCRIPTION

CBQE:2686 Add tests for conflict resolution and adjusted time

Change-Id: Id83dc48a1d1e04230f1746f14488f4bdc5cb9d03
Reviewed-on: http://review.couchbase.org/48341
Reviewed-by: Titus Ho <Titus xxx@xxx.xxx
Reviewed-by: Ezekiel Beck xxx@xxx.xxx
Tested-by: Ezekiel Beck xxx@xxx.xxx


COMMENTS

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

Change has been successfully cherry-picked as 8514bc0dcf8db8fa65f853588f747d083b572282

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