DESCRIPTION

changes for some new query tests.

Change-Id: I9c5823f2a6f8276037c4cee678e2f8dd0e59aa22


COMMENTS

author: Monique Barker
date: 2016-04-18 16:15:39.289000000

Uploaded patch set 1.

-------------------------------------
author: Hugo Blankenship
date: 2016-04-18 16:15:44.564000000

Patch Set 1:

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

-------------------------------------
author: Hugo Blankenship
date: 2016-04-18 17:16:06.657000000

Patch Set 1: Verified-1

Build Failed 

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

detect lines like:

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

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

-------------------------------------
author: Monique Barker
date: 2016-04-18 17:29:49.265000000

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

-------------------------------------
author: Monique Barker
date: 2016-04-18 17:30:08.539000000

Removed the following votes:

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


-------------------------------------
author: Tate Garrett
date: 2016-04-18 17:30:13.849000000

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-04-18 17:31:12.962000000

Change has been successfully cherry-picked as fbd5161cdd84ff50124987463f0c013ff8a13c3a

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