]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #46709 from zdover23/wip-doc-2022-06-15-backport-quincy-46705...
authorzdover23 <1445107+zdover23@users.noreply.github.com>
Thu, 16 Jun 2022 06:04:08 +0000 (16:04 +1000)
committerGitHub <noreply@github.com>
Thu, 16 Jun 2022 06:04:08 +0000 (16:04 +1000)
commit53a40c03a811fde58aa09edb4b8d531dae92d35a
tree9a4c658ff49f37e73a96cab0e0fc790c6e9ce07e
parenta826cfc830a75bbae573657c0c24565614b34fd0
parentde0cb4d9282320cb036e21a4b4c21771ba566612
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 <anthony.datri@gmail.com>