]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16c2f4c c615972)
Merge pull request #4499 from dachary/wip-11363-hammer
authorLoic Dachary <loic@dachary.org>
Mon, 4 May 2015 21:57:48 +0000 (23:57 +0200)
committerLoic Dachary <loic@dachary.org>
Mon, 4 May 2015 21:57:48 +0000 (23:57 +0200)
ImageWatcher should cancel in-flight ops on watch error

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

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