]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge branch 'stable'
authorSage Weil <sage@newdream.net>
Fri, 6 May 2011 20:43:05 +0000 (13:43 -0700)
committerSage Weil <sage@newdream.net>
Fri, 6 May 2011 20:43:05 +0000 (13:43 -0700)
commitfb84e6b26b916592c4f4ee0ccc9ba70ec4dd004a
tree3d378529881008c814c04277ca3a18e2ad26a099
parent739ab87d975fdee4fbd2deb3785934a67026bd20
parent48d94f6e34da8ace2b5cb128de1bcfb34b3c40b5
Merge branch 'stable'
src/os/FileStore.cc
src/osd/ReplicatedPG.cc