mosad 1e6437b773 Resolve conflict 2

2020-06-06 00:17:26 +02:00

..

roles

Resolve conflict 2

2020-06-06 00:17:26 +02:00

build.yml

yamllint: Make all files in awx pass yamllint

2019-12-02 15:12:51 +01:00

install.yml

yamllint: Make all files in awx pass yamllint

2019-12-02 15:12:51 +01:00

inventory

Fixes ca_trust_dir mapping for k8s and openshift

2020-05-15 02:37:33 -04:00