From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 16 Oct 2019 12:11:11 +0000 (-0400)
Subject: Merge pull request #30952 from mxdInspur/trash_restore_info_warn
X-Git-Tag: v15.1.0~1238
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=530245e34aad7b73221b1af33f0e693b7743cebc;p=ceph-ci.git

Merge pull request #30952 from mxdInspur/trash_restore_info_warn

rbd: delete redundant words when trash restore fails because of same name

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

530245e34aad7b73221b1af33f0e693b7743cebc