DESCRIPTION

changes.

Change-Id: Id5f0b24171afd6abfad473b5692b657d163bc0eb


COMMENTS

author: Tate Garrett
date: 2016-02-09 19:20:20.074000000

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

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

-------------------------------------
author: Tate Garrett
date: 2016-02-09 19:20:28.028000000

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

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

-------------------------------------
author: Monique Barker
date: 2016-02-09 19:23:33.884000000

Uploaded patch set 2.

-------------------------------------
author: Hugo Blankenship
date: 2016-02-09 19:23:49.024000000

Patch Set 2:

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

-------------------------------------
author: Monique Barker
date: 2016-02-09 19:23:57.293000000

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

-------------------------------------
author: Tate Garrett
date: 2016-02-09 19:23:58.930000000

Change has been successfully cherry-picked as 7d2cecf1371ee059f30283b4f8ff3d3558bb7be9

-------------------------------------
author: Hugo Blankenship
date: 2016-02-09 20:24:44.513000000

Patch Set 2:

Build Failed 

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

detect lines like:

suite viewmergetests.ViewMergingTests , pass 38 , fail 1 ( http://factory.couchbase.com//job/testrunner-Jasmin Rangel-sherlock/6587/ )

need to update, install, or configure build tools, environment variables, ssh credentials (requires no code change) ( http://factory.couchbase.com//job/testrunner-Jasmin Rangel-sherlock/6587/ )

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