DESCRIPTION

CBQE-3671: Update time_synchronization flag to conflict_resolution_type in testrunner
Change-Id: I2c2b7d5db83213553f5edb8faf4ce0d38b2bcf9b
Reviewed-on: http://review.couchbase.org/68909
Reviewed-by: Ezekiel Beck xxx@xxx.xxx
Tested-by: Adelaide Rodgers xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2016-10-19 17:23:33.141000000

Change has been successfully cherry-picked as 39307738fe9d54032eb3241f98385f74433f0b22 by Adelaide Rodgers

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