← Back to branch summary

~ntt-pf-lab/nova/monkey_patch_notification

~ntt-pf-lab/nova/monkey_patch_notification

Viewing all changes in revision 1458.

Committer: Nachi Ueno
Date: 2011-08-22 21:45:18 UTC
mfrom: (1450.2.22 nova)
Revision ID: ueno.nachi@lab.ntt.co.jp-20110822214518-pyz0ty8rxvijxqr9

Fixed conflict with branch

files added:
nova/api/openstack/schemas/v1.1/server.rng

nova/api/openstack/schemas/v1.1/servers.rng

nova/api/openstack/schemas/v1.1/servers_index.rng

nova/db/sqlalchemy/migrate_repo/versions/039_add_instances_accessip.py

nova/tests/example

nova/tests/example/__init__.py

nova/tests/example/example_a.py

nova/tests/example/example_b.py

files modified:
nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/contrib/floating_ips.py

nova/api/openstack/contrib/security_groups.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/extensions.py

nova/api/openstack/flavors.py

nova/api/openstack/images.py

nova/api/openstack/servers.py

nova/api/openstack/views/flavors.py

nova/api/openstack/views/images.py

nova/api/openstack/views/servers.py

nova/api/openstack/wsgi.py

nova/compute/api.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/tests/api/openstack/__init__.py

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

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

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

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

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

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

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

nova/tests/api/openstack/extensions/foxinsocks.py

nova/tests/api/openstack/test_auth.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_flavors_extra_specs.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_server_metadata.py

nova/tests/api/openstack/test_servers.py

nova/tests/integrated/api/client.py

nova/tests/integrated/test_login.py

nova/tests/test_compute.py

nova/tests/test_utils.py

nova/utils.py

Show diffs side-by-side

added added

removed removed

nova/api/openstack/__init__.py

nova/api/openstack/auth.py

nova/api/openstack/contrib/floating_ips.py

nova/api/openstack/contrib/security_groups.py

nova/api/openstack/create_instance_helper.py

nova/api/openstack/extensions.py

nova/api/openstack/flavors.py

nova/api/openstack/images.py

nova/api/openstack/schemas/v1.1/server.rng

nova/api/openstack/schemas/v1.1/servers.rng

nova/api/openstack/schemas/v1.1/servers_index.rng

nova/api/openstack/servers.py

nova/api/openstack/views/flavors.py

nova/api/openstack/views/images.py

nova/api/openstack/views/servers.py

nova/api/openstack/wsgi.py

nova/compute/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/migrate_repo/versions/039_add_instances_accessip.py

nova/db/sqlalchemy/models.py

nova/exception.py

nova/tests/api/openstack/__init__.py

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

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

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

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

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

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

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

nova/tests/api/openstack/extensions/foxinsocks.py

nova/tests/api/openstack/test_auth.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_flavors.py

nova/tests/api/openstack/test_flavors_extra_specs.py

nova/tests/api/openstack/test_image_metadata.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_server_actions.py

nova/tests/api/openstack/test_server_metadata.py

nova/tests/api/openstack/test_servers.py

nova/tests/example/

nova/tests/example/__init__.py

nova/tests/example/example_a.py

nova/tests/example/example_b.py

nova/tests/integrated/api/client.py

nova/tests/integrated/test_login.py

nova/tests/test_compute.py

nova/tests/test_utils.py

Older »