]> 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: 39da107 5da0662)
Merge remote branch 'origin/stable' into next
authorSage Weil <sage@newdream.net>
Thu, 23 Jun 2011 20:16:29 +0000 (13:16 -0700)
committerSage Weil <sage@newdream.net>
Thu, 23 Jun 2011 20:16:29 +0000 (13:16 -0700)
Conflicts:
src/librbd.cc


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.