Merge "HAProxy uses milliseconds for its timeout values."

This commit is contained in:
Jenkins 2016-07-11 21:48:32 +00:00 committed by Gerrit Code Review
commit b44ad42a0b

View File

@ -66,7 +66,8 @@ class CreateHealthMonitor(neutronV20.CreateCommand):
parser.add_argument( parser.add_argument(
'--delay', '--delay',
required=True, required=True,
help=_('The time in seconds between sending probes to members.')) help=_('The time in milliseconds between sending probes to '
'members.'))
parser.add_argument( parser.add_argument(
'--max-retries', '--max-retries',
required=True, required=True,
@ -75,8 +76,8 @@ class CreateHealthMonitor(neutronV20.CreateCommand):
parser.add_argument( parser.add_argument(
'--timeout', '--timeout',
required=True, required=True,
help=_('Maximum number of seconds for a monitor to wait for a ' help=_('Maximum number of milliseconds for a monitor to wait for '
'connection to be established before it times out. The ' 'a connection to be established before it times out. The '
'value must be less than the delay value.')) 'value must be less than the delay value.'))
parser.add_argument( parser.add_argument(
'--type', '--type',