]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-osd-leaks' into next
authorSage Weil <sage@inktank.com>
Fri, 31 May 2013 21:48:51 +0000 (14:48 -0700)
committerSage Weil <sage@inktank.com>
Fri, 31 May 2013 21:48:51 +0000 (14:48 -0700)
Reviewed-by: David Zafman <david.zafman@inktank.com>

Trivial merge