DESCRIPTION

Resolving merge conflicts

Change-Id: Ie5e921316786362c6fd0dbc94f5b2a78f13a9fa3


COMMENTS

author: Monique Barker
date: 2015-09-28 18:00:01.608000000

Uploaded patch set 1.

-------------------------------------
author: Hugo Blankenship
date: 2015-09-28 18:00:07.625000000

Patch Set 1:

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

-------------------------------------
author: Monique Barker
date: 2015-09-28 18:00:58.372000000

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

-------------------------------------
author: Tate Garrett
date: 2015-09-28 18:01:09.936000000

Change has been successfully cherry-picked as 5486024cdf886be4cd23bfafc45fa6650c0c7578

-------------------------------------
author: Hugo Blankenship
date: 2015-09-28 18:50:11.019000000

Patch Set 1:

Build Failed 

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

detect lines like:

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

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/5957/ )

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