]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #3822 from dachary/wip-10947-setcrushmap
authorLoic Dachary <ldachary@redhat.com>
Thu, 5 Mar 2015 13:28:27 +0000 (14:28 +0100)
committerLoic Dachary <ldachary@redhat.com>
Thu, 5 Mar 2015 13:28:27 +0000 (14:28 +0100)
commit452c651151f556702e9c94a399e600d64352ec1c
tree6f62f59af0f7aab0c6ea47683cc6ef8a8ee1a1e8
parent569b12035a5c2d449f394dee53d76ea3c5d5a048
parent1e3f81486940ceddc6aa110dc878a2810538e4c6
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>