← Back to branch summary

~hudson-openstack/nova/trunk

~hudson-openstack/nova/trunk

Viewing all changes in revision 1508.4.4.

Committer: Brian Waldon
Date: 2011-09-01 15:08:41 UTC
mfrom: (1519 nova)
mto: This revision was merged to the branch mainline in revision 1521.
Revision ID: brian.waldon@rackspace.com-20110901150841-zrk1g11k7cw1xvrt

merging trunk

files added:
nova/api/openstack/contrib/simple_tenant_usage.py

nova/compute/task_states.py

nova/compute/vm_states.py

nova/db/sqlalchemy/migrate_repo/versions/044_update_instance_states.py

nova/rpc/impl_kombu.py

nova/tests/api/openstack/contrib/test_simple_tenant_usage.py

nova/tests/test_context.py

nova/tests/test_rpc_carrot.py

nova/tests/test_rpc_common.py

nova/tests/test_rpc_kombu.py

files removed:
nova/tests/test_rpc_amqp.py

files renamed:
nova/rpc/amqp.py => nova/rpc/impl_carrot.py

files modified:
bin/instance-usage-audit

bin/nova-ajax-console-proxy

contrib/nova.sh

nova/api/ec2/cloud.py

nova/api/openstack/common.py

nova/api/openstack/contrib/floating_ips.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/servers.py

nova/api/openstack/views/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/context.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/flags.py

nova/image/glance.py

nova/network/api.py

nova/network/manager.py

nova/notifier/api.py

nova/rpc/__init__.py

nova/rpc/common.py

nova/scheduler/driver.py

nova/service.py

nova/tests/api/openstack/contrib/test_createserverext.py

nova/tests/api/openstack/contrib/test_floating_ips.py

nova/tests/api/openstack/contrib/test_security_groups.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_servers.py

nova/tests/image/test_glance.py

nova/tests/integrated/test_servers.py

nova/tests/scheduler/test_scheduler.py

nova/tests/test_adminapi.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_db_api.py

nova/tests/test_network.py

nova/tests/test_rpc.py

nova/tests/test_test.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/db_fakes.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/instance-usage-audit

bin/nova-ajax-console-proxy

contrib/nova.sh

nova/api/ec2/cloud.py

nova/api/openstack/common.py

nova/api/openstack/contrib/floating_ips.py

nova/api/openstack/contrib/simple_tenant_usage.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/servers.py

nova/api/openstack/views/servers.py

nova/compute/api.py

nova/compute/manager.py

nova/compute/task_states.py

nova/compute/vm_states.py

nova/context.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/044_update_instance_states.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/image/glance.py

nova/network/api.py

nova/network/manager.py

nova/notifier/api.py

nova/rpc/__init__.py

nova/rpc/common.py

nova/rpc/impl_carrot.py

nova/rpc/impl_kombu.py

nova/scheduler/driver.py

nova/service.py

nova/tests/api/openstack/contrib/test_createserverext.py

nova/tests/api/openstack/contrib/test_floating_ips.py

nova/tests/api/openstack/contrib/test_security_groups.py

nova/tests/api/openstack/contrib/test_simple_tenant_usage.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_servers.py

nova/tests/image/test_glance.py

nova/tests/integrated/test_servers.py

nova/tests/scheduler/test_scheduler.py

nova/tests/test_adminapi.py

nova/tests/test_cloud.py

nova/tests/test_compute.py

nova/tests/test_context.py

nova/tests/test_db_api.py

nova/tests/test_network.py

nova/tests/test_rpc.py

nova/tests/test_rpc_amqp.py

nova/tests/test_rpc_carrot.py

nova/tests/test_rpc_common.py

nova/tests/test_rpc_kombu.py

nova/tests/test_test.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/db_fakes.py

tools/pip-requires

Older »