]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32975 into master
authorSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 04:11:14 +0000 (22:11 -0600)
committerSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 04:11:14 +0000 (22:11 -0600)
* refs/pull/32975/head:
mon/ConfigMonitor: only propose if leader

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge