DESCRIPTION

CBQE-0: fix merging issue

Change-Id: Ib6780826f1617dceb35305b0091c49774adaa656


COMMENTS

author: Trevor Santana
date: 2014-10-01 15:56:58.021000000

Uploaded patch set 1.

-------------------------------------
author: Hugo Blankenship
date: 2014-10-01 15:57:05.368000000

Patch Set 1:

Build Started http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/2694/

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

Patch Set 1: Verified+1 Code-Review+2

-------------------------------------
author: Hugo Blankenship
date: 2014-10-01 16:14:48.371000000

Patch Set 1:

Build Successful 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/2694/ : SUCCESS

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