DESCRIPTION

CBQE-4289: Fixing merge failures

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


COMMENTS

author: Adelaide Rodgers
date: 2017-08-31 00:11:09.897000000

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

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