DESCRIPTION

CBQE-4289: Fix merge testcases

Change-Id: I2690f8f43a5f69ed7b8fec62f4f310ee444f4250
Reviewed-on: http://review.couchbase.org/82899
Reviewed-by: Adelaide Rodgers xxx@xxx.xxx
Tested-by: Adelaide Rodgers xxx@xxx.xxx


COMMENTS

author: Adelaide Rodgers
date: 2017-08-30 06:21:55.894000000

Change has been successfully cherry-picked as 431fd0f6e6171e4c2643d79bc3d2022b59cb67c5 by Adelaide Rodgers

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