From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 9 Jan 2015 00:28:11 +0000 (+0100)
Subject: Merge pull request #3220 from ceph/wip-mon-backports.firefly
X-Git-Tag: v0.80.8~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4b7b1b03bfcb7cb056783555884f211009ea5d46;p=ceph.git

Merge pull request #3220 from ceph/wip-mon-backports.firefly

mon: backports for #9987 against firefly

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

4b7b1b03bfcb7cb056783555884f211009ea5d46