]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bc45de0 048da58)
Merge pull request #36888 from batrick/release-notes-union
authorKefu Chai <kchai@redhat.com>
Sat, 29 Aug 2020 14:13:04 +0000 (22:13 +0800)
committerGitHub <noreply@github.com>
Sat, 29 Aug 2020 14:13:04 +0000 (22:13 +0800)
commita7ce3ea98ba5fa8548f442b6bbd96d61d5e769ff
treeef7e022dbed1ee44367ae618898c903b20d2203etree | snapshot
parentbc45de0af6fa6c0ebad640656c77e6f2329b8441commit | diff
parent048da589238a0c92390d119854b4d927e1837d2ecommit | diff
Merge pull request #36888 from batrick/release-notes-union

doc: use union merge strategy for resolving conflicts in PendingRelea…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.