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 python27_el6

Browse Source 
Conflicts:
	packaging/rpm/ansible-tower.spec
	tools/docker-compose/start_development.sh
This commit is contained in:
Graham Mainwaring
2016-03-21 12:13:50 -04:00
parent 1427fee442 edabf23c6a
commit 1e8e53e811
138 changed files with 4454 additions and 158607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/docker-compose/start_development.sh
View File

@@ -20,8 +20,7 @@ else
echo "Failed to find tower source tree, map your development tree volume"
fi
rm -rf /tower_devel/ansible_tower.egg-info
cp -R /tmp/ansible_tower.egg-info /tower_devel/
cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
# Check if we need to build dependencies
if [ -f "awx/lib/.deps_built" ]; then