← Back to branch summary

~rackspace-titan/nova/nova_image_metadata_1_1

~rackspace-titan/nova/nova_image_metadata_1_1

Viewing all changes in revision 797.

Committer: Naveed Massjouni
Date: 2011-03-15 19:05:43 UTC
mfrom: (784.1.22 nova)
Revision ID: naveedm9@gmail.com-20110315190543-ohtw83eyavn42b95

Merge from trunk.

files added:
nova/api/openstack/accounts.py

nova/api/openstack/users.py

nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py

nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py

nova/tests/api/openstack/test_accounts.py

nova/tests/api/openstack/test_users.py

nova/tests/integrated

nova/tests/integrated/__init__.py

nova/tests/integrated/api

nova/tests/integrated/api/__init__.py

nova/tests/integrated/api/client.py

nova/virt/cpuinfo.xml.template

files modified:
.mailmap

Authors

MANIFEST.in

bin/nova-dhcpbridge

bin/nova-manage

contrib/nova.sh

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/views/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/scheduler/driver.py

nova/scheduler/manager.py

nova/service.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_adminapi.py

nova/tests/api/openstack/test_auth.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_zones.py

nova/tests/db/fakes.py

nova/tests/test_compute.py

nova/tests/test_misc.py

nova/tests/test_network.py

nova/tests/test_scheduler.py

nova/tests/test_service.py

nova/tests/test_virt.py

nova/tests/test_volume.py

nova/tests/test_xenapi.py

nova/utils.py

nova/virt/disk.py

nova/virt/fake.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi/volume_utils.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

nova/volume/manager.py

nova/wsgi.py

plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py

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

Show diffs side-by-side

added added

removed removed

bin/nova-dhcpbridge

bin/nova-manage

contrib/nova.sh

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/accounts.py

nova/api/openstack/auth.py

nova/api/openstack/users.py

nova/api/openstack/views/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py

nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py

nova/db/sqlalchemy/models.py

nova/network/linux_net.py

nova/scheduler/driver.py

nova/scheduler/manager.py

nova/service.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_accounts.py

nova/tests/api/openstack/test_adminapi.py

nova/tests/api/openstack/test_auth.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_users.py

nova/tests/api/openstack/test_zones.py

nova/tests/db/fakes.py

nova/tests/integrated/

nova/tests/integrated/__init__.py

nova/tests/integrated/api/

nova/tests/integrated/api/__init__.py

nova/tests/integrated/api/client.py

nova/tests/test_compute.py

nova/tests/test_misc.py

nova/tests/test_network.py

nova/tests/test_scheduler.py

nova/tests/test_service.py

nova/tests/test_virt.py

nova/tests/test_volume.py

nova/tests/test_xenapi.py

nova/virt/cpuinfo.xml.template

nova/virt/disk.py

nova/virt/fake.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi/volume_utils.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

nova/volume/manager.py

plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py

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

Older »