← Back to branch summary

~justin-fathomdb/nova/bug744150

~justin-fathomdb/nova/bug744150

Viewing all changes in revision 556.5.7.

Committer: Andy Smith
Date: 2011-01-18 23:51:13 UTC
mfrom: (579 nova)
mto: This revision was merged to the branch mainline in revision 581.
Revision ID: code@term.ie-20110118235113-ivu21efg3h9z6niq

merge from upstream and fix small issues

files added:
bin/nova-direct-api

bin/stack

nova/api/__init__.py

nova/api/direct.py

nova/tests/glance

nova/tests/glance/__init__.py

nova/tests/glance/stubs.py

nova/tests/test_direct.py

run_tests.py

files removed:
bin/nova-api

nova/api/__init__.py

nova/tests/api/fakes.py

nova/tests/api/test.py

run_tests.py

tools/iscsidev.sh

files renamed:
bin/nova-api-paste => bin/nova-api

files modified:
.mailmap

Authors

MANIFEST.in

bin/nova-combined

bin/nova-manage

etc/nova-api.conf

nova/api/ec2/__init__.py

nova/api/ec2/apirequest.py

nova/api/ec2/cloud.py

nova/api/ec2/metadatarequesthandler.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/images.py

nova/api/openstack/ratelimiting/__init__.py

nova/auth/manager.py

nova/cloudpipe/pipelib.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/flags.py

nova/image/glance.py

nova/log.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/api/openstack/__init__.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_adminapi.py

nova/tests/api/openstack/test_api.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/test_access.py

nova/tests/test_api.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_console.py

nova/tests/test_virt.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/utils.py

nova/virt/fake.py

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/fake.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/xenapi/etc/xapi.d/plugins/glance

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/nova-combined

bin/nova-direct-api

bin/nova-manage

etc/nova-api.conf

nova/api/__init__.py

nova/api/__init__.py

nova/api/direct.py

nova/api/ec2/__init__.py

nova/api/ec2/apirequest.py

nova/api/ec2/cloud.py

nova/api/ec2/metadatarequesthandler.py

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/images.py

nova/api/openstack/ratelimiting/__init__.py

nova/auth/manager.py

nova/cloudpipe/pipelib.py

nova/compute/api.py

nova/compute/manager.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/image/glance.py

nova/network/linux_net.py

nova/network/manager.py

nova/tests/api/fakes.py

nova/tests/api/openstack/__init__.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_adminapi.py

nova/tests/api/openstack/test_api.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/test.py

nova/tests/glance/

nova/tests/glance/__init__.py

nova/tests/glance/stubs.py

nova/tests/test_access.py

nova/tests/test_api.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_console.py

nova/tests/test_direct.py

nova/tests/test_virt.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/virt/fake.py

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi_conn.py

nova/volume/driver.py

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

tools/iscsidev.sh

tools/pip-requires

Older »