From: Samuel Just <sjust@redhat.com>
Date: Tue, 29 Mar 2016 15:02:41 +0000 (-0700)
Subject: Merge pull request #8215 from dzafman/wip-14438
X-Git-Tag: v10.1.1~73^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3bc2911c19bd9e647ce2d65085498a53b01e7e6;p=ceph.git

Merge pull request #8215 from dzafman/wip-14438

Wip 14438

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

b3bc2911c19bd9e647ce2d65085498a53b01e7e6