From: zdover23 <1445107+zdover23@users.noreply.github.com>
Date: Fri, 4 Sep 2020 01:15:54 +0000 (+1000)
Subject: Merge pull request #36489 from zdover23/wip-doc-dev-merge-request-2020-aug
X-Git-Tag: v16.1.0~1196
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=018161417b57972756c89fde778f006fed21cf5e;p=ceph.git

Merge pull request #36489 from zdover23/wip-doc-dev-merge-request-2020-aug

doc/dev: add proper merge commit format
---

018161417b57972756c89fde778f006fed21cf5e