DESCRIPTION

CBQE-3505: Add changes for conflict resolition set-meta

Change-Id: Ia1db339a00d235754865583c9a137f30d888d2dd
Reviewed-on: http://review.couchbase.org/65464
Reviewed-by: Amani Conrad <Amani xxx@xxx.xxx
Tested-by: Amani Conrad <Amani xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2016-07-02 00:34:35.145000000

Change has been successfully cherry-picked as 54692edd0b83d2b3dd4cde9ff05f08f30a8edf98 by Amani Conrad

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