]> 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: 83914d2 7ea0783)
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Wed, 19 Oct 2011 16:14:24 +0000 (09:14 -0700)
committerSage Weil <sage@newdream.net>
Wed, 19 Oct 2011 16:14:24 +0000 (09:14 -0700)
Conflicts:
src/mon/OSDMonitor.cc
src/osd/OSD.cc


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