openstack
/
taskflow
Code Issues Proposed changes

Merge "Remove kwarg timeout in executor conductor"

This commit is contained in:
Zuul 2017-10-24 03:01:55 +00:00 committed by Gerrit Code Review
parent a121be0ac2 4bf1db9f43
commit e9e7337a38
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
taskflow/conductors/backends/impl_executor.py
View File

@ -22,7 +22,6 @@ try:
except ImportError:
from contextlib2 import ExitStack # noqa
from debtcollector import removals
from oslo_utils import excutils
from oslo_utils import timeutils
import six
@ -129,8 +128,7 @@ class ExecutorConductor(base.Conductor):
raise excp.NotImplementedError("This method must be implemented but"
" it has not been")
@removals.removed_kwarg('timeout', version="0.8", removal_version="2.0")
def stop(self, timeout=None):
def stop(self):
"""Requests the conductor to stop dispatching.
This method can be used to request that a conductor stop its