DESCRIPTION

merge

Change-Id: I84403deda90c791e99781e229019d7fcbd6c3620


COMMENTS

author: Monique Barker
date: 2016-03-22 23:00:13.598000000

Uploaded patch set 1.

-------------------------------------
author: Hugo Blankenship
date: 2016-03-22 23:00:18.455000000

Patch Set 1:

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

-------------------------------------
author: Monique Barker
date: 2016-03-22 23:01:26.591000000

Abandoned

-------------------------------------
author: Monique Barker
date: 2016-03-22 23:04:13.324000000

Restored

-------------------------------------
author: Monique Barker
date: 2016-03-22 23:04:17.679000000

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

-------------------------------------
author: Tate Garrett
date: 2016-03-22 23:04:19.100000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of Iaa444b26.
* Depends on patch set 1 of Ie929b12c.
* Depends on patch set 1 of Ia1286c05, however the current patch set is 2.
* Depends on commit 7126c0367066e456828fc58524e91c98dc4cd0e8 which has no change associated with it.
* Depends on commit 6ee08d0332be66f3f17d71afb095ab4405bd7ab2 which has no change associated with it.
* Depends on commit baeddf487365a6c846606212af5731a762b877ad which has no change associated with it.
* Depends on commit 1f172c98c13287756a1cc520178925156e1affec which has no change associated with it.
* Depends on commit 27b0ab176c55b261f09fd05a278ea80b6b4fc503 which has no change associated with it.
* Depends on commit f08be3abb1401ae6c9ed59520358c5330fe24397 which has no change associated with it.
* Depends on commit 8979099b02b2d56e2c29903add07282ce3bc01a8 which has no change associated with it.
* Depends on commit ffa72c0f1ea86c2d89e3dd89d1264452edadbfea which has no change associated with it.
* Depends on commit cabdcc65cba16b20cdf8a9c4d01bd37cea26357d which has no change associated with it.
* Depends on commit 63c5ff05e0a269078ff49cb3cb85f8ce74efc29b which has no change associated with it.
* Depends on commit 51ea93d53787c721d53d62032fc71a36c0aa6936 which has no change associated with it.
* Depends on commit 92a012b5534b5a71b785d07bfa33f628b7b51c4c which has no change associated with it.
* Depends on commit 913f1bf189219dc505f57d56b29bebc59bec4693 which has no change associated with it.

Please rebase the change and upload a replacement commit.

-------------------------------------
author: Hugo Blankenship
date: 2016-03-23 00:00:44.287000000

Patch Set 1: Verified-1

Build Failed 

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

detect lines like:

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

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

-------------------------------------
author: Tate Garrett
date: 2016-03-23 00:04:26.806000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of Iaa444b26.
* Depends on patch set 1 of Ie929b12c.
* Depends on patch set 1 of Ia1286c05, however the current patch set is 2.
* Depends on commit 7126c0367066e456828fc58524e91c98dc4cd0e8 which has no change associated with it.
* Depends on commit 6ee08d0332be66f3f17d71afb095ab4405bd7ab2 which has no change associated with it.
* Depends on commit baeddf487365a6c846606212af5731a762b877ad which has no change associated with it.
* Depends on commit 1f172c98c13287756a1cc520178925156e1affec which has no change associated with it.
* Depends on commit 27b0ab176c55b261f09fd05a278ea80b6b4fc503 which has no change associated with it.
* Depends on commit f08be3abb1401ae6c9ed59520358c5330fe24397 which has no change associated with it.
* Depends on commit 8979099b02b2d56e2c29903add07282ce3bc01a8 which has no change associated with it.
* Depends on commit ffa72c0f1ea86c2d89e3dd89d1264452edadbfea which has no change associated with it.
* Depends on commit cabdcc65cba16b20cdf8a9c4d01bd37cea26357d which has no change associated with it.
* Depends on commit 63c5ff05e0a269078ff49cb3cb85f8ce74efc29b which has no change associated with it.
* Depends on commit 51ea93d53787c721d53d62032fc71a36c0aa6936 which has no change associated with it.
* Depends on commit 92a012b5534b5a71b785d07bfa33f628b7b51c4c which has no change associated with it.
* Depends on commit 913f1bf189219dc505f57d56b29bebc59bec4693 which has no change associated with it.

Please rebase the change and upload a replacement commit.

-------------------------------------
author: Tate Garrett
date: 2016-03-23 11:04:26.910000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of Iaa444b26.
* Depends on patch set 1 of Ie929b12c.
* Depends on patch set 1 of Ia1286c05, however the current patch set is 2.
* Depends on commit 7126c0367066e456828fc58524e91c98dc4cd0e8 which has no change associated with it.
* Depends on commit 6ee08d0332be66f3f17d71afb095ab4405bd7ab2 which has no change associated with it.
* Depends on commit baeddf487365a6c846606212af5731a762b877ad which has no change associated with it.
* Depends on commit 1f172c98c13287756a1cc520178925156e1affec which has no change associated with it.
* Depends on commit 27b0ab176c55b261f09fd05a278ea80b6b4fc503 which has no change associated with it.
* Depends on commit f08be3abb1401ae6c9ed59520358c5330fe24397 which has no change associated with it.
* Depends on commit 8979099b02b2d56e2c29903add07282ce3bc01a8 which has no change associated with it.
* Depends on commit ffa72c0f1ea86c2d89e3dd89d1264452edadbfea which has no change associated with it.
* Depends on commit cabdcc65cba16b20cdf8a9c4d01bd37cea26357d which has no change associated with it.
* Depends on commit 63c5ff05e0a269078ff49cb3cb85f8ce74efc29b which has no change associated with it.
* Depends on commit 51ea93d53787c721d53d62032fc71a36c0aa6936 which has no change associated with it.
* Depends on commit 92a012b5534b5a71b785d07bfa33f628b7b51c4c which has no change associated with it.
* Depends on commit 913f1bf189219dc505f57d56b29bebc59bec4693 which has no change associated with it.

Please rebase the change and upload a replacement commit.

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