DESCRIPTION

Merge branch 'master' of https://github.com/couchbase/testrunner into HEAD

Conflicts:
	pytests/xdcr/xdcrbasetests.py

Change-Id: I60d9284ddb9a747f9bdf55b521c70a18d2e0a3a0


COMMENTS

author: Fisher Vargas
date: 2014-04-03 07:54:04.264000000

Uploaded patch set 1.

-------------------------------------
author: Fisher Vargas
date: 2014-04-03 07:58:27.631000000

Abandoned

-------------------------------------
author: Hugo Blankenship
date: 2014-04-03 09:36:43.975000000

Patch Set 1:

Build Started http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/928/

-------------------------------------
author: Hugo Blankenship
date: 2014-04-03 10:00:46.261000000

Patch Set 1:

Build Successful 

http://factory.couchbase.com/job/testrunner-Jasmin Rangel-master/928/ : SUCCESS

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