Rishabh Dave 4e94d11aa7 ceph-infra: remove ntp_rmp.yml and ntp_debian.yml ... This commit fixes the merge conflict that occurred during the auto-backport and auto-merge of the commit 488281187e. Also please note that the commit 488281187e was merged (on PR 3477) "as it is" (despite of merge conflicts) which was not supposed to be the case ideally. This had a side-effect that the feature of supporting multiple NTP daemons (new ones are namely chronyd and timesyncd) was also backported which is itself against the convention. For consistency's sake the feature was backported to stable-3.1 as well. Signed-off-by: Rishabh Dave <ridave@redhat.com>		2019-01-09 22:15:18 +01:00
..
handlers	ceph-infra: disable unrequired NTP services	2019-01-04 13:52:19 +00:00
meta	ceph-infra: add new role ceph-infra	2018-10-10 15:44:33 +00:00
tasks	ceph-infra: remove ntp_rmp.yml and ntp_debian.yml	2019-01-09 22:15:18 +01:00