Merge "Fix SQL Error with fixed ips under devstack/postgresql"

This commit is contained in:
Jenkins
2013-01-30 03:04:05 +00:00
committed by Gerrit Code Review

View File

@@ -724,7 +724,7 @@ class FixedIp(BASE, NovaBase):
foreign_keys=network_id, foreign_keys=network_id,
primaryjoin='and_(' primaryjoin='and_('
'FixedIp.network_id == Network.id,' 'FixedIp.network_id == Network.id,'
'FixedIp.deleted == False)') 'FixedIp.deleted == 0)')
class FloatingIp(BASE, NovaBase): class FloatingIp(BASE, NovaBase):