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

Merge branch 'purge_ansible_name' into release_3.2.0

Browse Source 
* purge_ansible_name:
  Remove ansible reference from dev PKG-INFO
  Add back in PRIVILEGE_ESCALATION_METHODS inadvertantly removed
  Add awx_ and AWX_ environment vars and extra_vars alongside Tower
  Refactor some tower periodic tasks to label as awx
  Refactor Notification backend for tower -> awx
  Refactor fact cache plugin from tower -> awx
  Rename tower display plugins to awx display
  Mass rename from ansible_(awx|tower) -> (awx|tower)
This commit is contained in:
Matthew Jones
2017-07-26 23:06:55 -04:00
parent d00ccfc442 7231537841
commit 2b1bcc23be
62 changed files with 126 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/sso/views.py
View File

@@ -16,7 +16,7 @@ from django.utils.encoding import smart_text
# Django REST Framework
from rest_framework.renderers import JSONRenderer
# Ansible Tower
# AWX
from awx.main.models import AuthToken
from awx.api.serializers import UserSerializer