]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit
projects / ceph-ansible.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da5c093) | patch
README-MULTISITE: fix old conflict v3.2.46
authorDimitri Savineau <dsavinea@redhat.com>
Tue, 7 Jul 2020 19:10:28 +0000 (15:10 -0400)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 7 Jul 2020 19:18:00 +0000 (21:18 +0200)
commita16bb2b630a64e7801b79f2c8bb656bb7c14538f
tree210a1964e9176a3e77d274a9650a84968c562f8atree | snapshot
parentda5c093ba497d4619027541da96ad20f9a1adf6ccommit | diff
README-MULTISITE: fix old conflict

The automatic backport [1] done by mergify has merged the backport PR
even if a conflict was present in the documentation.

[1] https://github.com/ceph/ceph-ansible/pull/3803

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
README-MULTISITE.md diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.