DESCRIPTION

CBQE-0: fix merging issue

Change-Id: Ib6780826f1617dceb35305b0091c49774adaa656
Reviewed-on: http://review.couchbase.org/41792
Reviewed-by: Trevor Santana xxx@xxx.xxx
Tested-by: Trevor Santana xxx@xxx.xxx


COMMENTS

author: Trevor Santana
date: 2014-10-01 15:57:16.494000000

Change has been successfully cherry-picked as 0014490b1430f52dc75fbb188b2256d092e86bf7

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