]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge remote branch 'gh/master' into wip-backfill
authorSage Weil <sage.weil@dreamhost.com>
Fri, 30 Dec 2011 18:43:33 +0000 (10:43 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Fri, 30 Dec 2011 18:43:33 +0000 (10:43 -0800)
commit7969cc4f28625863af15ae1f158085d5ee33f939
treeff91ba109d3cbd882c5c7638e7ce24821ed59416
parent959fd71f69f28ee964e6530d953f8f190aa1e147
parent0d9507c2b0b04a76a95e888853b87d9d986f6760
Merge remote branch 'gh/master' into wip-backfill
src/Makefile.am
src/common/config_opts.h
src/osd/OSD.cc