DESCRIPTION

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

Change-Id: I555bbda4ab7a6f48725141f062b46cd98d1ac7f6


COMMENTS

author: Hugo Blankenship
date: 2012-05-16 17:53:37.516000000

Patch Set 1:

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

-------------------------------------
author: Hugo Blankenship
date: 2012-05-16 17:58:54.665000000

Patch Set 1: Verified

Build Successful 

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

-------------------------------------
author: Reid Stokes
date: 2012-05-16 23:21:35.773000000

Patch Set 1: Looks good to me, approved



-------------------------------------
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.

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