From: zdover23 <1445107+zdover23@users.noreply.github.com> Date: Thu, 16 Jun 2022 06:04:08 +0000 (+1000) Subject: Merge pull request #46709 from zdover23/wip-doc-2022-06-15-backport-quincy-46705... X-Git-Tag: v17.2.4~254 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53a40c03a811fde58aa09edb4b8d531dae92d35a;p=ceph.git Merge pull request #46709 from zdover23/wip-doc-2022-06-15-backport-quincy-46705-master-to-main-dev-guide-merging quincy: doc/dev_guide: s/master/main in merging.rst Reviewed-by: Anthony D'Atri --- 53a40c03a811fde58aa09edb4b8d531dae92d35a