]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
1  2 
src/client/Client.cc
src/osd/ReplicatedPG.cc

Simple merge
Simple merge