]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'stable'
authorSage Weil <sage.weil@dreamhost.com>
Thu, 3 Feb 2011 19:58:59 +0000 (11:58 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Thu, 3 Feb 2011 19:58:59 +0000 (11:58 -0800)
Conflicts:
src/common/signal.cc
src/os/FileStore.cc

1  2 
src/mount/mount.ceph.c
src/osd/ReplicatedPG.cc

Simple merge
Simple merge