]> 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: f2d4574 ac874a6)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 20 Apr 2012 20:22:22 +0000 (13:22 -0700)
committerSage Weil <sage@newdream.net>
Fri, 20 Apr 2012 20:22:22 +0000 (13:22 -0700)
Conflicts:
src/osd/OpRequest.cc


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