From: Laura Paduano <lpaduano@suse.com>
Date: Fri, 24 Jul 2020 13:26:56 +0000 (+0200)
Subject: Merge pull request #35376 from Devp00l/update-backport-doc
X-Git-Tag: v16.1.0~1632
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f412106efea4ab90a313f39857ad5dd02e8e14fe;p=ceph.git

Merge pull request #35376 from Devp00l/update-backport-doc

doc: Resolving conflicts with ceph-backport.sh

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
---

f412106efea4ab90a313f39857ad5dd02e8e14fe