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

Merge branch 'devel' of github.com:ansible/ansible-tower into rbac

Browse Source
This commit is contained in:
Akita Noek
2016-03-04 14:02:01 -05:00
parent db6117a56d e5b0e2aeb3
commit e9c3d98a44
82 changed files with 21118 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -273,9 +273,9 @@ version_file:
# Do any one-time init tasks.
init:
@if [ "$(VIRTUAL_ENV)" ]; then \
$(PYTHON) manage.py register_instance --primary --hostname=127.0.0.1; \
tower-manage register_instance --primary --hostname=127.0.0.1; \
else \
sudo $(PYTHON) manage.py register_instance --primary --hostname=127.0.0.1; \
sudo tower-manage register_instance --primary --hostname=127.0.0.1; \
fi
# Refresh development environment after pulling new code.