DESCRIPTION

Revert "Revert "CBQE-4204: Fix P0s in spock for merge""

This reverts commit 79b7162d927e4f886ea4db7720e73ddd59c127a2.

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


COMMENTS

author: Adelaide Rodgers
date: 2017-07-17 21:31:04.698000000

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

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