← Back to branch summary

~0x44/nova/bug838466

~0x44/nova/bug838466

Viewing all changes in revision 1283.8.4.

Committer: Brian Waldon
Date: 2011-07-26 17:13:41 UTC
mfrom: (1324 nova)
mto: This revision was merged to the branch mainline in revision 1326.
Revision ID: brian.waldon@rackspace.com-20110726171341-jrclqn08ew7ngshr

merging trunk; resolving conflicts

files added:
nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py

nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py

nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py

nova/tests/test_db_api.py

nova/virt/libvirt/vif.py

nova/virt/vif.py

nova/virt/vmwareapi/vif.py

nova/virt/xenapi/vif.py

po/en_AU.po

po/en_GB.po

po/fr.po

po/tl.po

po/zh_TW.po

files removed:
nova/network/vmwareapi_net.py

nova/network/xenapi_net.py

files modified:
.bzrignore

.mailmap

Authors

bin/nova-dhcpbridge

bin/nova-manage

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/accounts.py

nova/api/openstack/backup_schedules.py

nova/api/openstack/common.py

nova/api/openstack/consoles.py

nova/api/openstack/contrib/multinic.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/extensions.py

nova/api/openstack/faults.py

nova/api/openstack/flavors.py

nova/api/openstack/image_metadata.py

nova/api/openstack/images.py

nova/api/openstack/ips.py

nova/api/openstack/limits.py

nova/api/openstack/server_metadata.py

nova/api/openstack/servers.py

nova/api/openstack/shared_ip_groups.py

nova/api/openstack/users.py

nova/api/openstack/versions.py

nova/api/openstack/views/addresses.py

nova/api/openstack/views/limits.py

nova/api/openstack/views/servers.py

nova/api/openstack/views/versions.py

nova/api/openstack/wsgi.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/compute/instance_types.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/image/glance.py

nova/image/s3.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/__init__.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_faults.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_limits.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_versions.py

nova/tests/api/openstack/test_wsgi.py

nova/tests/db/fakes.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_instance_types_extra_specs.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/tests/test_xenapi.py

nova/virt/driver.py

nova/virt/fake.py

nova/virt/hyperv.py

nova/virt/libvirt.xml.template

nova/virt/libvirt/connection.py

nova/virt/libvirt/firewall.py

nova/virt/libvirt/netutils.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/api.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/agent

plugins/xenserver/xenapi/etc/xapi.d/plugins/glance *

plugins/xenserver/xenapi/etc/xapi.d/plugins/migration *

plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore *

plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py *

plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost *

po/ast.po

po/cs.po

po/da.po

po/de.po

po/es.po

po/it.po

po/ja.po

po/pt_BR.po

po/ru.po

po/uk.po

po/zh_CN.po

run_tests.sh

smoketests/test_sysadmin.py

tools/esx/guest_tool.py

Show diffs side-by-side

added added

removed removed

bin/nova-dhcpbridge

bin/nova-manage

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/accounts.py

nova/api/openstack/backup_schedules.py

nova/api/openstack/common.py

nova/api/openstack/consoles.py

nova/api/openstack/contrib/multinic.py

nova/api/openstack/contrib/volumes.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/extensions.py

nova/api/openstack/faults.py

nova/api/openstack/flavors.py

nova/api/openstack/image_metadata.py

nova/api/openstack/images.py

nova/api/openstack/ips.py

nova/api/openstack/limits.py

nova/api/openstack/server_metadata.py

nova/api/openstack/servers.py

nova/api/openstack/shared_ip_groups.py

nova/api/openstack/users.py

nova/api/openstack/versions.py

nova/api/openstack/views/addresses.py

nova/api/openstack/views/limits.py

nova/api/openstack/views/servers.py

nova/api/openstack/views/versions.py

nova/api/openstack/wsgi.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/compute/instance_types.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/033_ha_network.py

nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py

nova/db/sqlalchemy/migrate_repo/versions/035_secondary_dns.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/image/glance.py

nova/image/s3.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/network/vmwareapi_net.py

nova/network/xenapi_net.py

nova/tests/__init__.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_faults.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_limits.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_versions.py

nova/tests/api/openstack/test_wsgi.py

nova/tests/db/fakes.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_db_api.py

nova/tests/test_instance_types_extra_specs.py

nova/tests/test_libvirt.py

nova/tests/test_network.py

nova/tests/test_xenapi.py

nova/virt/driver.py

nova/virt/fake.py

nova/virt/hyperv.py

nova/virt/libvirt.xml.template

nova/virt/libvirt/connection.py

nova/virt/libvirt/firewall.py

nova/virt/libvirt/netutils.py

nova/virt/libvirt/vif.py

nova/virt/vif.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/vif.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi_conn.py

nova/virt/xenapi/vif.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/api.py

plugins/xenserver/xenapi/etc/xapi.d/plugins/agent

smoketests/test_sysadmin.py

tools/esx/guest_tool.py

Older »