]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-defensive-alloc'
authorSage Weil <sage@inktank.com>
Tue, 22 May 2012 03:01:03 +0000 (20:01 -0700)
committerSage Weil <sage@inktank.com>
Tue, 22 May 2012 03:01:03 +0000 (20:01 -0700)

Trivial merge