From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 19 Jun 2021 02:49:15 +0000 (-0700)
Subject: Merge PR #40997 into master
X-Git-Tag: v17.1.0~1613
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=efea9ecac754e8ce7a24cb9368fe0351321b4c91;p=ceph.git

Merge PR #40997 into master

* 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>
---

efea9ecac754e8ce7a24cb9368fe0351321b4c91