← Back to branch summary

~citrix-openstack/nova/xenapi-netinject-prop

~citrix-openstack/nova/xenapi-netinject-prop

Viewing all changes in revision 699.

Committer: Salvatore Orlando
Date: 2011-03-10 11:13:01 UTC
mfrom: (669.1.112 nova)
Revision ID: salvatore.orlando@eu.citrix.com-20110310111301-7gin30vxpwa1ajfx

Merge trunk
Conflicts solved

files added:
nova/api/ec2/ec2utils.py

files modified:
bin/nova-api

bin/nova-manage

contrib/nova.sh

doc/ext/nova_autodoc.py

doc/source/man/novamanage.rst

doc/source/runnova/nova.manage.rst

nova/api/direct.py

nova/api/ec2/__init__.py

nova/api/ec2/cloud.py

nova/api/ec2/metadatarequesthandler.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/common.py

nova/api/openstack/consoles.py

nova/api/openstack/faults.py

nova/api/openstack/images.py

nova/api/openstack/ratelimiting/__init__.py

nova/api/openstack/servers.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/compute/manager.py

nova/console/xvp.py

nova/crypto.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/exception.py

nova/fakerabbit.py

nova/flags.py

nova/image/glance.py

nova/image/local.py

nova/image/s3.py

nova/image/service.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/objectstore/image.py

nova/service.py

nova/tests/api/openstack/common.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_zones.py

nova/tests/api/test_wsgi.py

nova/tests/fake_flags.py

nova/tests/glance/stubs.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_console.py

nova/tests/test_direct.py

nova/tests/test_misc.py

nova/tests/test_network.py

nova/tests/test_quota.py

nova/tests/test_scheduler.py

nova/tests/test_virt.py

nova/tests/test_volume.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/utils.py

nova/virt/disk.py

nova/virt/images.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

nova/wsgi.py

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

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

tools/euca-get-ajax-console

Show diffs side-by-side

added added

removed removed

bin/nova-manage

contrib/nova.sh

doc/ext/nova_autodoc.py

doc/source/man/novamanage.rst

doc/source/runnova/nova.manage.rst

nova/api/direct.py

nova/api/ec2/__init__.py

nova/api/ec2/cloud.py

nova/api/ec2/ec2utils.py

nova/api/ec2/metadatarequesthandler.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/common.py

nova/api/openstack/consoles.py

nova/api/openstack/faults.py

nova/api/openstack/images.py

nova/api/openstack/ratelimiting/__init__.py

nova/api/openstack/servers.py

nova/api/openstack/zones.py

nova/compute/api.py

nova/compute/manager.py

nova/console/xvp.py

nova/db/sqlalchemy/api.py

nova/exception.py

nova/fakerabbit.py

nova/image/glance.py

nova/image/local.py

nova/image/s3.py

nova/image/service.py

nova/network/api.py

nova/network/linux_net.py

nova/network/manager.py

nova/objectstore/image.py

nova/service.py

nova/tests/api/openstack/common.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/api/openstack/test_zones.py

nova/tests/api/test_wsgi.py

nova/tests/fake_flags.py

nova/tests/glance/stubs.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_console.py

nova/tests/test_direct.py

nova/tests/test_misc.py

nova/tests/test_network.py

nova/tests/test_quota.py

nova/tests/test_scheduler.py

nova/tests/test_virt.py

nova/tests/test_volume.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/virt/disk.py

nova/virt/images.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

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

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

tools/euca-get-ajax-console

Older »