DESCRIPTION

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

Change-Id: I290e5340d1f175610dfd9ec9d2cc8f78a049a909


COMMENTS

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.

-------------------------------------
author: Kenny Maynard
date: 2012-05-14 18:48:54.626000000

Uploaded patch set 3.

-------------------------------------
author: Jasmin Rangel
date: 2012-05-14 18:48:56.855000000

Patch Set 3:

New patchset patch-id matches previous patchset, but commit message has changed.

-------------------------------------
author: Kenny Maynard
date: 2012-05-14 18:52:38.977000000

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



-------------------------------------
author: Zackery Barr
date: 2012-05-14 18:56:52.807000000

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



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