From: Kefu Chai Date: Sat, 29 Aug 2020 14:13:04 +0000 (+0800) Subject: Merge pull request #36888 from batrick/release-notes-union X-Git-Tag: v16.1.0~1286 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a7ce3ea98ba5fa8548f442b6bbd96d61d5e769ff;p=ceph.git Merge pull request #36888 from batrick/release-notes-union doc: use union merge strategy for resolving conflicts in PendingRelea… Reviewed-by: Kefu Chai --- a7ce3ea98ba5fa8548f442b6bbd96d61d5e769ff