DESCRIPTION

CBQE-0: fix potential test code issue for merge_keys for bi-directional xdcr. Previously merge keys have None value in KvStore after merge and validation skipped.

Change-Id: I948128d622bf5bab3219d8071afbe0c42ec317ac
Reviewed-on: http://review.couchbase.org/40330
Reviewed-by: Fisher Vargas <Fisher xxx@xxx.xxx
Tested-by: Fisher Vargas <Fisher xxx@xxx.xxx


COMMENTS

author: Tate Garrett
date: 2014-08-06 10:24:08.747000000

The change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
author: Tate Garrett
date: 2014-08-06 10:24:42.327000000

The change could not be merged due to a path conflict.

Please rebase the change locally and upload the rebased commit for review.

-------------------------------------
author: Fisher Vargas
date: 2014-08-06 10:25:09.103000000

Change has been successfully cherry-picked as 9d742a8f5de0bfc7f3c74bccef783def9188add2

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