From: John Spray <john.spray@inktank.com>
Date: Tue, 2 Sep 2014 21:02:59 +0000 (+0100)
Subject: Merge pull request #2343 from ceph/wip-9151
X-Git-Tag: v0.86~152
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8657022cc8a664462b57f2d5156970a12c71729c;p=ceph.git

Merge pull request #2343 from ceph/wip-9151

Wip 9151 + 9152

Reviewed-by: Sage Weil <sage@redhat.com>
---

8657022cc8a664462b57f2d5156970a12c71729c