From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 18 Jul 2020 03:19:33 +0000 (-0700)
Subject: Merge PR #35902 into master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~628
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9908dc3e3188a3c7e4f38c23d44dc2289514f9a4;p=ceph-ci.git

Merge PR #35902 into master

* refs/pull/35902/head:
	ceph-dedup-tool: fix warning
	mds: slave -> peer
	mds: master -> leader

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

9908dc3e3188a3c7e4f38c23d44dc2289514f9a4