summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-12 13:46:13 +0000
committerGerrit Code Review <review@openstack.org>2014-03-12 13:46:13 +0000
commit5e7da3e2828d913b7fa3079d4b571368727ddc4a (patch)
tree369e8b8cb64bab09242473bf1ed7b1d74019804f
parentac103342a757f39bdc2c4341fdf9030195642a9e (diff)
parent3ec268356fc44847f7c85f8a0d2a5faf7c8fc822 (diff)
downloaddesignate-5e7da3e2828d913b7fa3079d4b571368727ddc4a.tar.gz
Merge "create_server fails if server is not unique"
-rw-r--r--designate/sqlalchemy/models.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/designate/sqlalchemy/models.py b/designate/sqlalchemy/models.py
index 6279280b..523bcfc8 100644
--- a/designate/sqlalchemy/models.py
+++ b/designate/sqlalchemy/models.py
@@ -34,7 +34,8 @@ class Base(object):
except IntegrityError as e:
non_unique_strings = (
'duplicate entry',
- 'not unique'
+ 'not unique',
+ 'unique constraint failed'
)
for non_unique_string in non_unique_strings: