DESCRIPTION

changes.

Change-Id: Iedd7d696f37942bb7dc5842a1fa2c1d0a7a243db


COMMENTS

author: Monique Barker
date: 2016-04-23 00:22:04.920000000

Uploaded patch set 1.

-------------------------------------
author: Hugo Blankenship
date: 2016-04-23 00:22:14.066000000

Patch Set 1:

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

-------------------------------------
author: Hugo Blankenship
date: 2016-04-23 00:22:33.752000000

Patch Set 1: Verified-1

Build Failed 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-sherlock/7156/ : FAILURE

-------------------------------------
author: Monique Barker
date: 2016-04-23 00:23:50.087000000

Removed the following votes:

* Verified-1 by Hugo Blankenship xxx@xxx.xxx


-------------------------------------
author: Monique Barker
date: 2016-04-23 00:23:53.592000000

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

-------------------------------------
author: Tate Garrett
date: 2016-04-23 00:23:56.312000000

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

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

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