]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 343cc79 95ac5ba)
Merge branch 'next'
authorSage Weil <sage@inktank.com>
Sun, 17 Jun 2012 21:00:02 +0000 (14:00 -0700)
committerSage Weil <sage@inktank.com>
Sun, 17 Jun 2012 21:00:02 +0000 (14:00 -0700)
1  2 
src/cls_rbd.cc patch | diff1 | diff2 | blob | history

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