]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #22268 from xiaoxichen/backport_22243_mimic
authorKefu Chai <tchaikov@gmail.com>
Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
committerGitHub <noreply@github.com>
Tue, 10 Jul 2018 12:41:50 +0000 (20:41 +0800)
commit2ff4c01858cba300de3e726d67c75ff6d9cb75dc
tree75a5017e9f67b111da6f9c7ca642f0eb2f484a13
parent4ed78ecf2f27aae1e9eb27f83611285ec7445ebd
parent9656bf1429135cfe476ac923ea5ab208731f58a5
Merge pull request #22268 from xiaoxichen/backport_22243_mimic

mimic: mon/OSDMonitor: Respect paxos_propose_interval

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h