]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
projects / ceph-ansible.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ae2a68) | patch
ceph-osd: Fix merge conflict from mergify
authorDimitri Savineau <dsavinea@redhat.com>
Wed, 24 Apr 2019 16:31:18 +0000 (12:31 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Wed, 24 Apr 2019 16:41:23 +0000 (12:41 -0400)
commit54128db5cd66057b4c7b7c91093043695080c723
tree486c7e6b67d69dec6d05c6de63021340a303dbe7tree | snapshot
parent3ae2a687ede1b0ad8d884e198c0f97bf0eb36fcfcommit | diff
ceph-osd: Fix merge conflict from mergify

The PR #3916 was merged automatically by mergify even if there was a
confict in the ceph-osd-run.sh.j2 template.
This commit resolves the conflict.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
roles/ceph-osd/templates/ceph-osd-run.sh.j2 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.