]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8ce73f 7945f8d)
Merge pull request #2697 from ceph/wip-8900
authorJosh Durgin <jdurgin@redhat.com>
Tue, 13 Jan 2015 19:17:29 +0000 (11:17 -0800)
committerJosh Durgin <jdurgin@redhat.com>
Tue, 13 Jan 2015 19:17:29 +0000 (11:17 -0800)
RBD image watcher and new exclusive lock handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/librbd/internal.cc patch | diff1 | diff2 | blob | history
src/test/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/librbd/internal.cc
Simple merge
diff --cc src/test/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.