]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into unstable
authorSage Weil <sage@newdream.net>
Mon, 4 Oct 2010 18:21:51 +0000 (11:21 -0700)
committerSage Weil <sage@newdream.net>
Mon, 4 Oct 2010 18:21:51 +0000 (11:21 -0700)
Conflicts:
src/mds/Locker.cc

1  2 
src/mds/MDCache.cc
src/osd/ReplicatedPG.cc
src/rgw/rgw_op.cc

Simple merge
Simple merge
Simple merge