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

resolve rebase errors

Browse Source
This commit is contained in:
chris meyers
2020-02-14 14:36:19 -05:00
committed by Ryan Petrello
parent 03b73027e8
commit f5193e5ea5
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/management/commands/run_dispatcher.py
View File

@@ -11,7 +11,7 @@ from awx.main.utils.handlers import AWXProxyHandler
from awx.main.dispatch import get_local_queuename, reaper from awx.main.dispatch import get_local_queuename, reaper
from awx.main.dispatch.control import Control from awx.main.dispatch.control import Control
from awx.main.dispatch.pool import AutoscalePool from awx.main.dispatch.pool import AutoscalePool
from awx.main.dispatch.worker import AWXConsumer, TaskWorker from awx.main.dispatch.worker import AWXConsumerPG, TaskWorker
from awx.main.dispatch import periodic from awx.main.dispatch import periodic
logger = logging.getLogger('awx.main.dispatch') logger = logging.getLogger('awx.main.dispatch')

1
requirements/requirements.txt
View File

@@ -101,7 +101,6 @@ python-string-utils==0.6.0 # via openshift
python3-openid==3.1.0 # via social-auth-core python3-openid==3.1.0 # via social-auth-core
python3-saml==1.9.0 python3-saml==1.9.0
pytz==2019.3 # via django, irc, tempora, twilio pytz==2019.3 # via django, irc, tempora, twilio
pyyaml==5.2 # via ansible-runner, djangorestframework-yaml, kubernetes
pyyaml==5.3 # via ansible-runner, djangorestframework-yaml, kubernetes pyyaml==5.3 # via ansible-runner, djangorestframework-yaml, kubernetes
redis==3.3.11 redis==3.3.11
requests-futures==1.0.0 requests-futures==1.0.0