]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'unstable' into osd_pglog_checksums
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 6 Oct 2010 21:51:15 +0000 (14:51 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 6 Oct 2010 21:51:15 +0000 (14:51 -0700)

Trivial merge