]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
doc: use union merge strategy for resolving conflicts in PendingRelea…

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.