From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 10 Feb 2015 20:59:17 +0000 (+0100)
Subject: Merge pull request #3191 from ceph/giant-10277
X-Git-Tag: v0.87.1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34103b6355881820aa10b354c2427654bf229e8f;p=ceph.git

Merge pull request #3191 from ceph/giant-10277

Giant 10277
---

34103b6355881820aa10b354c2427654bf229e8f