]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #35902 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:19:33 +0000 (20:19 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 18 Jul 2020 03:19:33 +0000 (20:19 -0700)
* refs/pull/35902/head:
ceph-dedup-tool: fix warning
mds: slave -> peer
mds: master -> leader

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

Trivial merge