DESCRIPTION

Merge branch 'master' of git://github.com/couchbase/testrunner into xdcr-rebal-wed
Sync up  the local repository with remote

Conflicts:
	conf/py-xdcr-unidirectional.conf
	pytests/xdcr-mod/unidirectional-xdcr.py
	pytests/xdcr-mod/xdcrbasetests.py

Change-Id: I995c011092406d691075a7e917213fd44f1d9079


COMMENTS

author: Hugo Blankenship
date: 2012-07-19 20:56:42.763000000

Patch Set 1:

Build Started http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/1795/ 

-------------------------------------
author: Hugo Blankenship
date: 2012-07-19 21:21:02.886000000

Patch Set 1: Verified

Build Successful 

http://qa.hq.northscale.net/job/testrunner-Jasmin Rangel-master/1795/ : SUCCESS

-------------------------------------
author: Monique Barker
date: 2016-05-04 22:44:54.020000000

Patch Set 1: Code-Review+2

-------------------------------------
author: Tate Garrett
date: 2016-05-04 22:45:00.644000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of I00998ac6, however the current patch set is 7.

Please rebase the change and upload a replacement commit.

-------------------------------------
author: Tate Garrett
date: 2016-05-05 10:49:28.917000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 1 of I00998ac6, however the current patch set is 7.

Please rebase the change and upload a replacement commit.

-------------------------------------
author: Monique Barker
date: 2016-05-05 21:14:52.389000000

Abandoned

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