mosad eb5970b4a1 merge and resolve conflicts

2020-06-10 16:01:17 +02:00

..

defaults

merge and resolve conflicts

2020-06-10 16:01:17 +02:00

handlers

fix linting failures

2020-01-13 15:58:19 -05:00

tasks

Only build one awx image instead of separate web and task images

2020-06-03 10:48:48 -04:00

templates

merge and resolve conflicts

2020-06-10 16:01:17 +02:00

vars

Hardcode --kubeconfig and therefore only support OpenShift 3.11+

2020-05-29 13:41:49 -04:00