]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge branch 'testing' into next
authorDan Mick <dan.mick@inktank.com>
Thu, 6 Dec 2012 02:18:41 +0000 (18:18 -0800)
committerDan Mick <dan.mick@inktank.com>
Thu, 6 Dec 2012 02:18:41 +0000 (18:18 -0800)

Trivial merge