]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #7417 from dachary/wip-14553-hammer
authorJosh Durgin <jdurgin@redhat.com>
Sat, 30 Jan 2016 19:44:50 +0000 (11:44 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Sat, 30 Jan 2016 19:44:50 +0000 (11:44 -0800)
commit97d4f6a7bed5a0d47f18b3a223a916aef355eaf9
tree92bc4607232659dc0f539f70af8099397ffd114a
parent51cc015c7e20d2ea9b9517238481fb80687be17c
parent46d626d92d7af218816d831cfcc1265b3ea31b72
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>