From: Samuel Just <sjust@redhat.com>
Date: Fri, 8 Jan 2016 19:37:56 +0000 (-0800)
Subject: Merge pull request #6801 from athanatos/wip-13965
X-Git-Tag: v10.0.2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd2947902affcdbcfc8a2f0456685025e70ad882;p=ceph.git

Merge pull request #6801 from athanatos/wip-13965

Wip 13965

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

cd2947902affcdbcfc8a2f0456685025e70ad882