]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #34088 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 4 May 2020 13:44:39 +0000 (06:44 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 4 May 2020 13:44:39 +0000 (06:44 -0700)
* refs/pull/34088/head:
doc: mailmap: changes for octopus release

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
.mailmap
.organizationmap

diff --cc .mailmap
Simple merge
Simple merge