]> 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: adfa2e0 1e0f128)
Merge remote-tracking branch 'origin/wip-11579' into next
authorJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 03:15:25 +0000 (20:15 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 18 Jun 2015 03:15:25 +0000 (20:15 -0700)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/librbd/ImageCtx.cc patch | diff1 | diff2 | blob | history

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