summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-30 03:04:05 +0000
committerGerrit Code Review <review@openstack.org>2013-01-30 03:04:05 +0000
commitb919a330084ec171eccce828b5b73898e8a2f092 (patch)
treeb849c69d77645d65498466a7b46b9db85c905227
parentcc03923fcc23e5124d81e3270eec70cb0db5a07d (diff)
parentdff7b9f344b5ebc3529217317d665500c603fa1e (diff)
downloadnova-b919a330084ec171eccce828b5b73898e8a2f092.tar.gz
nova-b919a330084ec171eccce828b5b73898e8a2f092.tar.xz
nova-b919a330084ec171eccce828b5b73898e8a2f092.zip
Merge "Fix SQL Error with fixed ips under devstack/postgresql"
-rw-r--r--nova/db/sqlalchemy/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 53d6f53bd..fd8348678 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -724,7 +724,7 @@ class FixedIp(BASE, NovaBase):
foreign_keys=network_id,
primaryjoin='and_('
'FixedIp.network_id == Network.id,'
- 'FixedIp.deleted == False)')
+ 'FixedIp.deleted == 0)')
class FloatingIp(BASE, NovaBase):