← Back to branch summary

~rackspace-titan/nova/nova_image_metadata_1_1

~rackspace-titan/nova/nova_image_metadata_1_1

Viewing all changes in revision 818.

Committer: Dan Prince
Date: 2011-03-25 12:57:42 UTC
mfrom: (784.1.101 nova)
Revision ID: dan.prince@rackspace.com-20110325125742-ydlxer9re6wtpzup

Merge w/ trunk.

files added:
doc/source/images/vmwareapi_blockdiagram.jpg

doc/source/vmwareapi_readme.rst

nova/api/openstack/extensions.py

nova/console/vmrc.py

nova/console/vmrc_manager.py

nova/network/vmwareapi_net.py

nova/objectstore/s3server.py

nova/tests/api/openstack/extensions

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

nova/tests/api/openstack/test_extensions.py

nova/tests/test_vmwareapi.py

nova/tests/vmwareapi

nova/tests/vmwareapi/__init__.py

nova/tests/vmwareapi/db_fakes.py

nova/tests/vmwareapi/stubs.py

nova/virt/vmwareapi

nova/virt/vmwareapi/__init__.py

nova/virt/vmwareapi/error_util.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/io_util.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/read_write_util.py

nova/virt/vmwareapi/vim.py

nova/virt/vmwareapi/vim_util.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi/vmware_images.py

nova/virt/vmwareapi_conn.py

tools/esx

tools/esx/guest_tool.py

files removed:
nova/objectstore/bucket.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/objectstore/stored.py

files renamed:
nova/tests/objectstore_unittest.py => nova/tests/test_objectstore.py

files modified:
Authors

bin/nova-direct-api

bin/nova-objectstore

bin/stack

etc/api-paste.ini

nova/api/direct.py

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/common.py

nova/api/openstack/images.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/flags.py

nova/image/glance.py

nova/image/local.py

nova/image/service.py

nova/test.py

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/image/test_glance.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_login.py

nova/tests/test_cloud.py

nova/tests/test_direct.py

nova/tests/test_virt.py

nova/tests/test_xenapi.py

nova/tests/xenapi/stubs.py

nova/utils.py

nova/virt/connection.py

nova/virt/driver.py

nova/virt/interfaces.template

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

nova/volume/driver.py

tools/pip-requires

Show diffs side-by-side

added added

removed removed

bin/nova-direct-api

bin/nova-objectstore

doc/source/images/vmwareapi_blockdiagram.jpg

doc/source/vmwareapi_readme.rst

etc/api-paste.ini

nova/api/direct.py

nova/api/ec2/cloud.py

nova/api/openstack/__init__.py

nova/api/openstack/common.py

nova/api/openstack/extensions.py

nova/api/openstack/images.py

nova/api/openstack/servers.py

nova/compute/api.py

nova/console/vmrc.py

nova/console/vmrc_manager.py

nova/image/glance.py

nova/image/local.py

nova/image/service.py

nova/network/vmwareapi_net.py

nova/objectstore/bucket.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/objectstore/s3server.py

nova/objectstore/stored.py

nova/tests/api/openstack/extensions/

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

nova/tests/api/openstack/fakes.py

nova/tests/api/openstack/test_extensions.py

nova/tests/api/openstack/test_images.py

nova/tests/api/openstack/test_servers.py

nova/tests/image/test_glance.py

nova/tests/integrated/integrated_helpers.py

nova/tests/integrated/test_login.py

nova/tests/test_cloud.py

nova/tests/test_direct.py

nova/tests/test_objectstore.py

nova/tests/test_virt.py

nova/tests/test_vmwareapi.py

nova/tests/test_xenapi.py

nova/tests/vmwareapi/

nova/tests/vmwareapi/__init__.py

nova/tests/vmwareapi/db_fakes.py

nova/tests/vmwareapi/stubs.py

nova/tests/xenapi/stubs.py

nova/virt/connection.py

nova/virt/driver.py

nova/virt/interfaces.template

nova/virt/libvirt.xml.template

nova/virt/libvirt_conn.py

nova/virt/vmwareapi/

nova/virt/vmwareapi/__init__.py

nova/virt/vmwareapi/error_util.py

nova/virt/vmwareapi/fake.py

nova/virt/vmwareapi/io_util.py

nova/virt/vmwareapi/network_utils.py

nova/virt/vmwareapi/read_write_util.py

nova/virt/vmwareapi/vim.py

nova/virt/vmwareapi/vim_util.py

nova/virt/vmwareapi/vm_util.py

nova/virt/vmwareapi/vmops.py

nova/virt/vmwareapi/vmware_images.py

nova/virt/vmwareapi_conn.py

nova/virt/xenapi/vm_utils.py

nova/virt/xenapi/vmops.py

nova/volume/api.py

nova/volume/driver.py

tools/esx/guest_tool.py

tools/pip-requires

Older »