summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Meyers <chris.meyers.fsu@gmail.com>2016-05-09 15:17:58 +0200
committerChris Meyers <chris.meyers.fsu@gmail.com>2016-05-09 15:17:58 +0200
commit1ab761b7b762a6c7a400e3bac6157f31bcf274e9 (patch)
tree409f4172e1ea163d842147f71650c27686a77a74
parentMerge pull request #1833 from jaredevantabor/notification_templates (diff)
downloadawx-1ab761b7b762a6c7a400e3bac6157f31bcf274e9.tar.xz
awx-1ab761b7b762a6c7a400e3bac6157f31bcf274e9.zip
test updates and httpd role fix
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9ec2365cae..5095c8d699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,7 @@ awx/ui/build_test
# Tower setup playbook testing
setup/test/roles/postgresql
-setup/test/roles/provision_docker
+**/provision_docker
# Python & setuptools
__pycache__
@@ -89,6 +89,9 @@ setup/setup.log
setup/inventory
tower-backup-*
+# Ansible
+**/*.retry
+
# Other
.tower_cycle
env/*