DESCRIPTION

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

Change-Id: I290e5340d1f175610dfd9ec9d2cc8f78a049a909


COMMENTS

author: Kenny Maynard
date: 2012-05-13 19:15:18.293000000

Uploaded patch set 2.

-------------------------------------
author: Kenny Maynard
date: 2012-05-14 18:44:24.525000000

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

Pushing to special branch for testing.

-------------------------------------
author: Tate Garrett
date: 2012-05-14 18:44:24.813000000

Change cannot be merged due to unsatisfiable dependencies.

The following dependency errors were found:

* Depends on patch set 3 of I0b71e4e2, however the current patch set is 5.

Please rebase the change and upload a replacement commit.

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