]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #22269 from xiaoxichen/backport_22243
authorYuri Weinstein <yweinste@redhat.com>
Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
committerGitHub <noreply@github.com>
Fri, 22 Jun 2018 16:23:50 +0000 (09:23 -0700)
commit75a329c41e64010a31d47f468e28900ba8e1357a
tree04be09f8dfa677640001d0927b99f7a61ee43110
parent730e91a95f9e932fe86235c241ea4acfa2704877
parent99f14e2f43e51b88ee9bc192fc0d6cc8dce05e1e
Merge pull request #22269 from xiaoxichen/backport_22243

luminous: mon/OSDMonitor: Respect paxos_propose_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h