]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51cc015 46d626d)
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)
hammer: rbd: TaskFinisher::cancel should remove event from SafeTimer

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.