DESCRIPTION

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

Conflicts:
	conf/py-xdcr-unidirectional.conf

Change-Id: I46d8ec65a18c812f8e0e35025d370d4f6827bf59


COMMENTS

author: Fisher Vargas
date: 2014-02-12 07:24:36.373000000

Abandoned

-------------------------------------
author: Hugo Blankenship
date: 2014-02-12 07:43:25.286000000

Patch Set 1:

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

-------------------------------------
author: Hugo Blankenship
date: 2014-02-12 08:08:26.882000000

Patch Set 1:

Build Successful 

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

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