Dimitri Savineau 54128db5cd 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>		2019-04-24 12:41:23 -04:00
..
ceph-osd-run.sh.j2	ceph-osd: Fix merge conflict from mergify	2019-04-24 12:41:23 -04:00
ceph-osd.service.d-overrides.j2	Allow ceph service systemd overrides to be specified	2017-08-16 17:57:06 +01:00
ceph-osd.service.j2	osd: change unit template for ceph-volume container	2018-10-10 16:08:41 -04:00
tmpfiles_hugepage.j2	move system tuning to osd role	2018-03-15 14:06:26 +01:00