]> 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: 458901d fc2e511)
Merge pull request #4323 from ceph/wip-11363
authorJosh Durgin <jdurgin@redhat.com>
Sat, 11 Apr 2015 01:04:30 +0000 (18:04 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Sat, 11 Apr 2015 01:04:30 +0000 (18:04 -0700)
librbd: ImageWatcher should cancel in-flight ops on watch error

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/ImageWatcher.cc patch | diff1 | diff2 | blob | history
src/librbd/ImageWatcher.h patch | diff1 | diff2 | blob | history

diff --cc src/librbd/ImageWatcher.cc
Simple merge
diff --cc src/librbd/ImageWatcher.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.