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

Merge remote-tracking branch 'tower/release_3.3.1' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2018-11-01 12:07:02 -04:00
parent a28f8c43cb c8e208dea7
commit a748a272fb
11 changed files with 114 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -600,7 +600,6 @@ docker-compose-cluster-elk: docker-auth
minishift-dev:
ansible-playbook -i localhost, -e devtree_directory=$(CURDIR) tools/clusterdevel/start_minishift_dev.yml
clean-elk:
docker stop tools_kibana_1
docker stop tools_logstash_1