From: Loic Dachary <loic@dachary.org>
Date: Tue, 7 Apr 2015 14:39:28 +0000 (+0200)
Subject: Merge pull request #4258 from ceph/wip-10643-v2
X-Git-Tag: v0.87.2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a13e1065829c59987c2f57a13eaa03de31df4ed;p=ceph.git

Merge pull request #4258 from ceph/wip-10643-v2

mon: MDSMonitor: additional backports for #10643

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

1a13e1065829c59987c2f57a13eaa03de31df4ed