From: Josh Durgin <jdurgin@redhat.com>
Date: Sat, 30 Jan 2016 19:44:50 +0000 (-0800)
Subject: Merge pull request #7417 from dachary/wip-14553-hammer
X-Git-Tag: v0.94.6~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=97d4f6a7bed5a0d47f18b3a223a916aef355eaf9;p=ceph.git

Merge pull request #7417 from dachary/wip-14553-hammer

hammer: rbd: TaskFinisher::cancel should remove event from SafeTimer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

97d4f6a7bed5a0d47f18b3a223a916aef355eaf9