]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #2080 from ceph/wip-8306-rebase
authorSage Weil <sage@inktank.com>
Mon, 7 Jul 2014 21:52:17 +0000 (14:52 -0700)
committerSage Weil <sage@inktank.com>
Mon, 7 Jul 2014 21:52:17 +0000 (14:52 -0700)
Wip 8306 rebase

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>

Trivial merge