Revert "Merge branch 'release_3.0.0' into devel"

This reverts commit 3cedfe6c679e5b289bd0a27defb6198d063ba8e8.
This commit is contained in:
Matthew Jones
2016-07-07 12:40:10 -04:00
parent 22437f80ed
commit 6b73fb2c27
321 changed files with 8400 additions and 8261 deletions

View File

@@ -18831,6 +18831,10 @@ awx/ui/static/lib/select2/dist/css/select2.css
awx/ui/templates/ui/index.html
config/awx-httpd-443.conf
config/awx-httpd-80.conf
config/awx-munin-el.conf
config/awx-munin-ubuntu.conf
config/awx-munin.conf
config/awx_munin_tower_jobs
config/wsgi.py
docs/licenses/Babel.txt
docs/licenses/IP.txt
@@ -19009,6 +19013,17 @@ requirements/requirements.txt
requirements/requirements_dev.txt
requirements/requirements_jenkins.txt
requirements/requirements_python26.txt
tools/munin_monitors/callbackr_alive
tools/munin_monitors/celery_alive
tools/munin_monitors/mongo_conn
tools/munin_monitors/mongo_docs
tools/munin_monitors/mongo_mem
tools/munin_monitors/mongo_ops
tools/munin_monitors/postgres_alive
tools/munin_monitors/redis_alive
tools/munin_monitors/socketio_alive
tools/munin_monitors/taskmanager_alive
tools/munin_monitors/tower_jobs
tools/scripts/ansible-tower-service
tools/scripts/request_tower_configuration.ps1
tools/scripts/request_tower_configuration.sh