Viewing all changes in revision 742.1.129.
- Committer: Trey Morris
- Date: 2011-06-30 19:20:59 UTC
- mfrom: (1236 nova)
- mto: This revision was merged to the branch mainline in revision 1237.
- Revision ID: trey.morris@rackspace.com-20110630192059-pi1p516i50t8pc06
trunk merge with migration renumbering
- files renamed:
- nova/db/sqlalchemy/migrate_repo/versions/029_multi_nic.py => nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py
- nova/db/sqlalchemy/migrate_repo/versions/030_fk_fixed_ips_virtual_interface_id.py => nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py
- nova/db/sqlalchemy/migrate_repo/versions/030_sqlite_downgrade.sql => nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_downgrade.sql
- nova/db/sqlalchemy/migrate_repo/versions/030_sqlite_upgrade.sql => nova/db/sqlalchemy/migrate_repo/versions/031_sqlite_upgrade.sql
- files modified:
- nova/api/ec2/cloud.py
expand all
collapse all
added
removed
