]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d09c48 1700d18)
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)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.