DESCRIPTION

conflicts merged

Change-Id: I105c7d6a6a085f5a0ac3f268af8c3ac172ad90e8


COMMENTS

author: Monique Barker
date: 2015-09-28 18:17:58.306000000

Uploaded patch set 1.

-------------------------------------
author: Monique Barker
date: 2015-09-28 18:18:46.012000000

Abandoned

Not needed anymore

-------------------------------------
author: Hugo Blankenship
date: 2015-09-28 18:37:27.389000000

Patch Set 1:

Build Started http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/5959/

-------------------------------------
author: Hugo Blankenship
date: 2015-09-28 19:13:21.927000000

Patch Set 1:

Build Successful 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/5959/ : SUCCESS

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