From: zdover23 <1445107+zdover23@users.noreply.github.com> Date: Wed, 25 Nov 2020 14:16:51 +0000 (+1000) Subject: Merge pull request #38143 from anthonyeleven/anthonyeleven/docs-46364 X-Git-Tag: v16.1.0~483 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea57d5d7ee4a4c2bb38a12c1f0baa3604612f08c;p=ceph.git Merge pull request #38143 from anthonyeleven/anthonyeleven/docs-46364 doc/dev/developer_guide: What Is Merged and When?" could be less colloquial Reviewed-by: Zac Dover --- ea57d5d7ee4a4c2bb38a12c1f0baa3604612f08c