openstack
/
heat
Code Issues Proposed changes

Merge "Clarify the help text for error_wait_time"

This commit is contained in:
Jenkins 2016-04-21 04:15:31 +00:00 committed by Gerrit Code Review
parent fe8f0cd48b 9f046cbbcc
commit f3cca03c9a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/common/config.py
View File

@ -154,8 +154,9 @@ engine_opts = [
' update).')),
cfg.IntOpt('error_wait_time',
default=240,
help=_('Error wait time in seconds for stack action (ie. create'
' or update).')),
help=_('The amount of time in seconds after an error has'
' occurred that tasks may continue to run before'
' being cancelled.')),
cfg.IntOpt('engine_life_check_timeout',
default=2,
help=_('RPC timeout for the engine liveness check that is used'