]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #34067 into octopus
authorSage Weil <sage@redhat.com>
Sun, 22 Mar 2020 15:55:54 +0000 (10:55 -0500)
committerSage Weil <sage@redhat.com>
Sun, 22 Mar 2020 15:55:54 +0000 (10:55 -0500)
commit3b28477f0d65412ec0ed3c3d698a3aeaad45099c
treec0501d75a20595ced99784cc8baffc12a1eb3515
parent5d09c481a434e899dcc00b815499c05a63123568
parent1700d181580f9ffc9a808ee29daf661f3776a901
Merge PR #34067 into octopus

* refs/pull/34067/head:
mgr/DaemonServer: add explicit check that acting matches for merge

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>