]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 569b120 1e3f814)
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)
mon: timeout if crushtool takes longer than mon_lease

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.