DESCRIPTION

CBQE-4204: Fix P0s in spock for merge

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


COMMENTS

author: Adelaide Rodgers
date: 2017-07-15 01:37:30.614000000

Change has been successfully cherry-picked as 966815c0025679991689f23e91d0d7bd28eb0ba4 by Adelaide Rodgers

-------------------------------------
author: Adelaide Rodgers
date: 2017-07-17 21:26:53.798000000

Created a revert of this change as I167d82ae9b77056dac22b85fa1c18d0e3f6de2f3

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