From: Loic Dachary <ldachary@redhat.com>
Date: Tue, 10 Feb 2015 20:58:52 +0000 (+0100)
Subject: Merge pull request #3186 from ceph/wip-giant-mon-backports
X-Git-Tag: v0.87.1~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94889cf6bef5a542e51bf8434dbe7c68f64604ce;p=ceph.git

Merge pull request #3186 from ceph/wip-giant-mon-backports

mon: backports for #9987 against giant
---

94889cf6bef5a542e51bf8434dbe7c68f64604ce