From 3c653424f2963ed6347b3aa7ed5e14817eed4b2d Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Fri, 28 Aug 2015 17:34:25 -0400 Subject: [PATCH] Remove duplicate exception InstanceUpdateConflict was defined twice. This removes the one with the less verbose msg. Change-Id: I31846edc79f094ba02f61636fd3c6015d6a6ed1b --- nova/exception.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nova/exception.py b/nova/exception.py index 1e436ba9ee9f..9ad78ef9f095 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -1525,10 +1525,6 @@ class InstanceFaultRollback(NovaException): super(InstanceFaultRollback, self).__init__(message % inner_exception) -class InstanceUpdateConflict(NovaException): - msg_fmt = _('Conflict updating instance %(instance_uuid)s') - - class OrphanedObjectError(NovaException): msg_fmt = _('Cannot call %(method)s on orphaned %(objtype)s object')