DESCRIPTION

CBQE-0: Fixing failures in merge testcases - watson

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


COMMENTS

author: Adelaide Rodgers
date: 2017-08-03 03:42:55.236000000

Change has been successfully cherry-picked as f8a17531780143bd7d72b950b856af7e6bca4bf8 by Adelaide Rodgers

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