From 5378102cd61fcafa6f052e231cd3ece3624fb363 Mon Sep 17 00:00:00 2001
From: aditi <aditi.s@nectechnologies.in>
Date: Fri, 20 Oct 2017 02:19:06 +0000
Subject: [PATCH] Fix unnecessary retries during conflict

This patch removes retries from python-watcherclient in case
watcher-api responded with conflict case.

Change-Id: I830abe0a3cd67484e165a0a42d5a57b75ed4dac6
Closes-Bug: #1725088
---
 watcherclient/common/httpclient.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/watcherclient/common/httpclient.py b/watcherclient/common/httpclient.py
index 04e9908..6eba147 100644
--- a/watcherclient/common/httpclient.py
+++ b/watcherclient/common/httpclient.py
@@ -165,8 +165,7 @@ class VersionNegotiationMixin(object):
         raise NotImplementedError()
 
 
-_RETRY_EXCEPTIONS = (exceptions.Conflict,
-                     exceptions.ServiceUnavailable,
+_RETRY_EXCEPTIONS = (exceptions.ServiceUnavailable,
                      exceptions.ConnectionRefused,
                      kexceptions.RetriableConnectionFailure)