]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed6792b 91f01bd)
Merge pull request #6789 from dillaman/wip-13969
authorJosh Durgin <jdurgin@redhat.com>
Thu, 3 Dec 2015 14:55:51 +0000 (06:55 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 3 Dec 2015 14:55:51 +0000 (06:55 -0800)
librbd: partial revert of commit 9b0e359

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

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