openstack/placement
Code Issues Proposed changes

merging trunk; resolving conflicts

Browse Source
This commit is contained in:
Brian Waldon 2011-09-12 17:52:29 -04:00
commit 03f48620d8
1 changed files with 1 additions and 1 deletions

2
nova/db/sqlalchemy/api.py

@ -672,7 +672,7 @@ def floating_ip_update(context, address, values):
def fixed_ip_associate(context, address, instance_id, network_id=None,
reserved=False):
"""Keyword arguments:
reserved -- should be a boolean value(True or False), exact value will be
reserved -- should be a boolean value(True or False), exact value will be
used to filter on the fixed ip address
"""
session = get_session()