← Back to branch summary

~reldan/nova/l-m-n-fix-network-info

~reldan/nova/l-m-n-fix-network-info

Viewing all changes in revision 635.3.23.

Committer: Sandy Walsh
Date: 2011-03-03 14:55:02 UTC
mfrom: (757 nova)
mto: This revision was merged to the branch mainline in revision 782.
Revision ID: sandy.walsh@rackspace.com-20110303145502-ow2b0cgs00zlhtt7

trunk merge, pip-requires and novatools to novaclient changes

doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst

doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst

doc/source/api/nova..tests.test_instance_types.rst

doc/source/api/nova..tests.test_test.rst

doc/source/api/nova..tests.test_utils.rst

doc/source/runnova/managing.instance.types.rst

nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py

nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py

nova/tests/test_instance_types.py

files modified:
.mailmap

Authors

bin/nova-manage

doc/.autogenerated

doc/source/api/autoindex.rst

doc/source/man/novamanage.rst

doc/source/nova.concepts.rst

nova/api/ec2/admin.py

nova/api/openstack/__init__.py

nova/api/openstack/common.py

nova/api/openstack/flavors.py

nova/api/openstack/servers.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/network/manager.py

nova/scheduler/zone_manager.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_flavors.py

nova/tests/db/fakes.py

nova/tests/test_quota.py

nova/tests/test_xenapi.py

nova/tests/test_zones.py

nova/tests/xenapi/stubs.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi/volumeops.py

nova/virt/xenapi_conn.py

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

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/nova-manage

doc/.autogenerated

doc/source/api/autoindex.rst

doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.005_add_instance_metadata.rst

doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.006_add_provider_data_to_volumes.rst

doc/source/api/nova..db.sqlalchemy.migrate_repo.versions.007_add_instance_types.rst

doc/source/api/nova..tests.test_instance_types.rst

doc/source/api/nova..tests.test_test.rst

doc/source/api/nova..tests.test_utils.rst

doc/source/man/novamanage.rst

doc/source/nova.concepts.rst

doc/source/runnova/managing.instance.types.rst

nova/api/ec2/admin.py

nova/api/openstack/__init__.py

nova/api/openstack/common.py

nova/api/openstack/flavors.py

nova/api/openstack/servers.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/007_add_ipv6_to_fixed_ips.py

nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py

nova/db/sqlalchemy/models.py

nova/network/manager.py

nova/scheduler/zone_manager.py

nova/tests/api/openstack/test_common.py

nova/tests/api/openstack/test_flavors.py

nova/tests/db/fakes.py

nova/tests/test_instance_types.py

nova/tests/test_quota.py

nova/tests/test_xenapi.py

nova/tests/test_zones.py

nova/tests/xenapi/stubs.py

nova/virt/libvirt_conn.py

nova/virt/xenapi/fake.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/virt/xenapi/volumeops.py

nova/virt/xenapi_conn.py

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

tools/pip-requires

Older »