]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #40997 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Jun 2021 02:49:15 +0000 (19:49 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Jun 2021 02:49:15 +0000 (19:49 -0700)
* refs/pull/40997/head:
test: add test to verify adding an active peer back to source
pybind/mirroring: disallow adding a active peer back to source
pybind/cephfs: interface to fetch file system id

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge