]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'next'
authorDan Mick <dan.mick@inktank.com>
Thu, 6 Dec 2012 01:39:17 +0000 (17:39 -0800)
committerDan Mick <dan.mick@inktank.com>
Thu, 6 Dec 2012 01:39:17 +0000 (17:39 -0800)
Pull in fixes for 3567 and 3524


Trivial merge