DESCRIPTION

Merge branch 'master' of github.com:membase/testrunner into stoprebalancerest

Conflicts:
	lib/membase/api/rest_client.py
	pytests/rebalancetests.py

Change-Id: I520051c4ad7de43e56934140ce9012537187deda


COMMENTS

author: Zackery Barr
date: 2011-07-13 23:24:04.625000000

Patch Set 1: Abandoned

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