From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 22 Jun 2018 16:23:50 +0000 (-0700)
Subject: Merge pull request #22269 from xiaoxichen/backport_22243
X-Git-Tag: v12.2.6~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=75a329c41e64010a31d47f468e28900ba8e1357a;p=ceph.git

Merge pull request #22269 from xiaoxichen/backport_22243

luminous: mon/OSDMonitor: Respect paxos_propose_interval

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

75a329c41e64010a31d47f468e28900ba8e1357a