← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/api.py

  • Committer: Brian Waldon
  • Date: 2011-09-12 21:52:29 UTC
  • mfrom: (1558 nova)
  • mto: This revision was merged to the branch mainline in revision 1561.
  • Revision ID: brian.waldon@rackspace.com-20110912215229-5xab1wvvd11rft6g
merging trunk; resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/api.py
672
672
def fixed_ip_associate(context, address, instance_id, network_id=None,
673
673
                       reserved=False):
674
674
    """Keyword arguments:
675
 
    reserved -- should be a boolean value(True or False), exact value will be 
 
675
    reserved -- should be a boolean value(True or False), exact value will be
676
676
    used to filter on the fixed ip address
677
677
    """
678
678
    session = get_session()