Merge "Fix unnecessary retries during conflict"

This commit is contained in:
Zuul
2017-12-13 14:24:13 +00:00
committed by Gerrit Code Review

View File

@@ -165,8 +165,7 @@ class VersionNegotiationMixin(object):
raise NotImplementedError() raise NotImplementedError()
_RETRY_EXCEPTIONS = (exceptions.Conflict, _RETRY_EXCEPTIONS = (exceptions.ServiceUnavailable,
exceptions.ServiceUnavailable,
exceptions.ConnectionRefused, exceptions.ConnectionRefused,
kexceptions.RetriableConnectionFailure) kexceptions.RetriableConnectionFailure)