External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-19 12:10:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

merge and resolve conflict

Browse Source
This commit is contained in:
Dmytro Makovey
2018-09-18 11:35:35 -07:00
parent adaa164a19 0bb1b0ed45
commit f8d2a32756
912 changed files with 56525 additions and 35552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
installer/inventory
View File

@@ -20,6 +20,7 @@ dockerhub_version=latest
# Kubernetes Install
# kubernetes_context=test-cluster
# kubernetes_namespace=awx
# tiller_namespace=kube-system
# Kubernetes and Openshift Install Resource Requests
# This is the request value for a pod's "task" container, which is the container