← Back to branch summary

~ntt-pf-lab/nova/network-service

~ntt-pf-lab/nova/network-service

Viewing all changes in revision 775.

Committer: Hisaharu Ishii
Date: 2011-04-17 07:33:45 UTC
mfrom: (767.1.54 network-service-local)
Revision ID: ishii.hisaharu@lab.ntt.co.jp-20110417073345-53a90e9p1rxl129r

Merged from lp:~midokura/nova/network-service branch

files added:
bin/nova-network-manage

nova/network/flat_vlan/api/openstack/ethernet_cards.py

nova/network/flat_vlan/db/migration.py

nova/network/flat_vlan/db/sqlalchemy/migration.py

nova/network/flat_vlan/firewall.py

files removed:
bin/nova-net-flat-vlan-manage

nova/network/flat_vlan/api/openstack/virtual_nics.py

files modified:
nova/api/ec2/cloud.py

nova/auth/manager.py

nova/compute/api.py

nova/network/flat_vlan/api/service.py

nova/network/flat_vlan/compute.py

nova/network/flat_vlan/db/api.py

nova/network/flat_vlan/db/sqlalchemy/migrate_repo/versions/001_diablo.py

nova/network/flat_vlan/db/sqlalchemy/models.py

nova/network/flat_vlan/flags.py

nova/network/flat_vlan/manager.py

nova/network/flat_vlan/network.py

nova/network/service.py

nova/virt/libvirt_conn.py

Show diffs side-by-side

added added

removed removed

bin/nova-net-flat-vlan-manage

bin/nova-network-manage

nova/api/ec2/cloud.py

nova/auth/manager.py

nova/compute/api.py

nova/network/flat_vlan/api/openstack/ethernet_cards.py

nova/network/flat_vlan/api/openstack/virtual_nics.py

nova/network/flat_vlan/api/service.py

nova/network/flat_vlan/compute.py

nova/network/flat_vlan/db/api.py

nova/network/flat_vlan/db/migration.py

nova/network/flat_vlan/db/sqlalchemy/migrate_repo/versions/001_diablo.py

nova/network/flat_vlan/db/sqlalchemy/migration.py

nova/network/flat_vlan/db/sqlalchemy/models.py

nova/network/flat_vlan/firewall.py

nova/network/flat_vlan/flags.py

nova/network/flat_vlan/manager.py

nova/network/flat_vlan/network.py

nova/network/service.py

nova/virt/libvirt_conn.py

Older »