summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRyan Petrello <rpetrell@redhat.com>2018-11-01 17:07:02 +0100
committerRyan Petrello <rpetrell@redhat.com>2018-11-01 17:07:02 +0100
commita748a272fb4edd140f5a35f64d558f5a980a27dd (patch)
treeeb2587a0bc8c24b84981029b50e3ccfb67ac0e6a /Makefile
parentMerge pull request #2569 from shanemcd/devel (diff)
parentMerge pull request #3074 from wwitzel3/release_3.3.1 (diff)
downloadawx-a748a272fb4edd140f5a35f64d558f5a980a27dd.tar.xz
awx-a748a272fb4edd140f5a35f64d558f5a980a27dd.zip
Merge remote-tracking branch 'tower/release_3.3.1' into devel
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f5e5ef2ce0..4337c13c22 100644
--- a/Makefile
+++ b/Makefile
@@ -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