]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'origin/wip-osd-leaks'
authorGreg Farnum <greg@inktank.com>
Tue, 29 Jul 2014 17:33:34 +0000 (10:33 -0700)
committerGreg Farnum <greg@inktank.com>
Tue, 29 Jul 2014 17:34:46 +0000 (10:34 -0700)
Reviewed-by: Greg Farnum <greg@inktank.com>

Trivial merge