From f5193e5ea5e906cf217bc9e33069702983673216 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Fri, 14 Feb 2020 14:36:19 -0500 Subject: [PATCH] resolve rebase errors --- awx/main/management/commands/run_dispatcher.py | 2 +- requirements/requirements.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/main/management/commands/run_dispatcher.py b/awx/main/management/commands/run_dispatcher.py index d12b23f275..c6d4bc71dc 100644 --- a/awx/main/management/commands/run_dispatcher.py +++ b/awx/main/management/commands/run_dispatcher.py @@ -11,7 +11,7 @@ from awx.main.utils.handlers import AWXProxyHandler from awx.main.dispatch import get_local_queuename, reaper from awx.main.dispatch.control import Control 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 logger = logging.getLogger('awx.main.dispatch') diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8366788ebc..86218efd07 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -101,7 +101,6 @@ python-string-utils==0.6.0 # via openshift python3-openid==3.1.0 # via social-auth-core python3-saml==1.9.0 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 redis==3.3.11 requests-futures==1.0.0