Merge "Revert "HAProxy uses milliseconds for its timeout values.""

This commit is contained in:
Jenkins
2017-04-18 16:00:57 +00:00
committed by Gerrit Code Review

View File

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