DESCRIPTION

Merge remote-tracking branch 'couchbase/taskmanager-dev-merge'

Conflicts:
	pytests/viewquerytests.py

Change-Id: I555bbda4ab7a6f48725141f062b46cd98d1ac7f6


COMMENTS

author: Tate Garrett
date: 2012-05-16 23:22:02.876000000

Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for review.

-------------------------------------
author: Kenny Maynard
date: 2012-05-16 23:32:51.226000000

Uploaded patch set 2.

-------------------------------------
author: Kenny Maynard
date: 2012-05-16 23:33:06.578000000

Patch Set 2: Verified; Looks good to me, approved



-------------------------------------
author: Kenny Maynard
date: 2012-05-16 23:33:06.834000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Hugo Blankenship
date: 2012-05-16 23:33:27.977000000

Patch Set 2:

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

-------------------------------------
author: Hugo Blankenship
date: 2012-05-16 23:39:02.992000000

Patch Set 2:

Build Successful 

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

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