]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #35376 from Devp00l/update-backport-doc
authorLaura Paduano <lpaduano@suse.com>
Fri, 24 Jul 2020 13:26:56 +0000 (15:26 +0200)
committerGitHub <noreply@github.com>
Fri, 24 Jul 2020 13:26:56 +0000 (15:26 +0200)
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>

Trivial merge