From: Sage Weil <sage@inktank.com>
Date: Mon, 7 Jul 2014 21:52:17 +0000 (-0700)
Subject: Merge pull request #2080 from ceph/wip-8306-rebase
X-Git-Tag: v0.84~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=083f9fe445a47930e14bf631debbda4662b352ab;p=ceph.git

Merge pull request #2080 from ceph/wip-8306-rebase

Wip 8306 rebase

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

083f9fe445a47930e14bf631debbda4662b352ab