Merge "Remove extra whitespace"

This commit is contained in:
Jenkins 2016-01-14 04:17:31 +00:00 committed by Gerrit Code Review
commit cd3e720515
4 changed files with 4 additions and 4 deletions

View File

@ -305,7 +305,7 @@ class ReplaceJson(Replace):
'value': value}) 'value': value})
else: else:
raise TypeError(_('"%s" params must be strings, numbers, ' raise TypeError(_('"%s" params must be strings, numbers, '
'list or map. ') % self.fn_name) 'list or map.') % self.fn_name)
return string.replace(placeholder, six.text_type(value)) return string.replace(placeholder, six.text_type(value))

View File

@ -52,7 +52,7 @@ class ManilaShareType(resource.Resource):
DRIVER_HANDLES_SHARE_SERVERS: properties.Schema( DRIVER_HANDLES_SHARE_SERVERS: properties.Schema(
properties.Schema.BOOLEAN, properties.Schema.BOOLEAN,
_('Required extra specification. ' _('Required extra specification. '
'Defines if share drivers handles share servers. '), 'Defines if share drivers handles share servers.'),
required=True, required=True,
), ),
EXTRA_SPECS: properties.Schema( EXTRA_SPECS: properties.Schema(

View File

@ -323,7 +323,7 @@ class Workflow(signal_responder.SignalResponder,
' Any numeric value - then the task will run once ' ' Any numeric value - then the task will run once '
'at least this number of upstream tasks are ' 'at least this number of upstream tasks are '
'completed and corresponding conditions have ' 'completed and corresponding conditions have '
'triggered. '), 'triggered.'),
support_status=support.SupportStatus(version='6.0.0') support_status=support.SupportStatus(version='6.0.0')
), ),
}, },

View File

@ -483,7 +483,7 @@ class Server(stack_user.StackUser, sh.SchedulerHintsMixin,
'{"public": [ip1, ip2...], "private": [ip3, ip4], ' '{"public": [ip1, ip2...], "private": [ip3, ip4], '
'"public_uuid": [ip1, ip2...], "private_uuid": [ip3, ip4]}. ' '"public_uuid": [ip1, ip2...], "private_uuid": [ip3, ip4]}. '
'Each network will have two keys in dict, they are network ' 'Each network will have two keys in dict, they are network '
'name and network id. '), 'name and network id.'),
type=attributes.Schema.MAP type=attributes.Schema.MAP
), ),
FIRST_ADDRESS: attributes.Schema( FIRST_ADDRESS: attributes.Schema(