DESCRIPTION

CBQE-0: fix conf file

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


COMMENTS

author: Tate Garrett
date: 2013-09-02 07:31:23.661000000

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

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

-------------------------------------
author: Trevor Santana
date: 2013-09-02 07:33:14.363000000

Change has been successfully cherry-picked as c1d15d3f6ee4572e2fab8b2f2ea914c672e47c19

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