]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #32981 into master
authorSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 03:56:18 +0000 (21:56 -0600)
committerSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 03:56:18 +0000 (21:56 -0600)
commitd2e5961ac9ff205585192a8179544f9b8c6c0027
tree83023fd0e11804e0f30bea49613c8043f83cac4c
parenta7988dfd3f474163fc5e4ade8a2f369d7c2ea2ef
parent337d12ba802d5b31db36be25c3349b9b67ec17ba
Merge PR #32981 into master

* refs/pull/32981/head:
mon: elector: return after triggering a new election

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>