]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'origin/stable'
authorSage Weil <sage@newdream.net>
Tue, 10 May 2011 21:33:30 +0000 (14:33 -0700)
committerSage Weil <sage@newdream.net>
Tue, 10 May 2011 21:33:30 +0000 (14:33 -0700)
commitd67dba764d7601d41ef6da2ef5f25decf6098a09
tree657b9ea553d6bb6e99ede2eb4881117ff78b6e06
parent331c01e847c471980c31980a618c3bce3face50e
parentd006c6f2c0aa97c894f631a33d667460fcb0a72d
Merge remote branch 'origin/stable'
src/client/Client.cc
src/osd/ReplicatedPG.cc