From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 5 Mar 2015 13:28:27 +0000 (+0100)
Subject: Merge pull request #3822 from dachary/wip-10947-setcrushmap
X-Git-Tag: v0.94~63
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=452c651151f556702e9c94a399e600d64352ec1c;p=ceph.git

Merge pull request #3822 from dachary/wip-10947-setcrushmap

mon: timeout if crushtool takes longer than mon_lease

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
---

452c651151f556702e9c94a399e600d64352ec1c