]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'wip-5815' into next
authorDan Mick <dan.mick@inktank.com>
Thu, 1 Aug 2013 06:01:03 +0000 (23:01 -0700)
committerDan Mick <dan.mick@inktank.com>
Thu, 1 Aug 2013 06:01:03 +0000 (23:01 -0700)
Reviewed-by: Sage Weil <sage@inktank.com>

Trivial merge