← Back to branch summary

~0x44/nova/bug838466

~0x44/nova/bug838466

Viewing all changes in revision 265.2.32.

Committer: Soren Hansen
Date: 2010-09-24 08:25:29 UTC
mfrom: (292 trunk)
mto: (265.7.7 ec2-security-groups)
mto: This revision was merged to the branch mainline in revision 344.
Revision ID: soren.hansen@rackspace.com-20100924082529-9qb47ib8wy9bwa8w

Merge trunk

files added:
nova/api/cloudpipe

nova/api/ec2/metadatarequesthandler.py

nova/api/rackspace/auth.py

nova/tests/api/rackspace/auth.py

nova/tests/api/rackspace/test_helper.py

files removed:
bin/nova-api

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

nova/cloudpipe/api.py => nova/api/cloudpipe/__init__.py

files modified:
bin/nova-manage

doc/source/auth.rst

nova/api/__init__.py

nova/api/ec2/__init__.py

nova/api/ec2/apirequest.py

nova/api/rackspace/__init__.py

nova/auth/manager.py

nova/cloudpipe/pipelib.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/rpc.py

nova/scheduler/driver.py

nova/tests/access_unittest.py

nova/tests/api/__init__.py

nova/tests/api_unittest.py

nova/tests/cloud_unittest.py

run_tests.py

Show diffs side-by-side

added added

removed removed

bin/nova-manage

doc/source/auth.rst

nova/api/__init__.py

nova/api/cloudpipe/

nova/api/cloudpipe/__init__.py

nova/api/ec2/__init__.py

nova/api/ec2/apirequest.py

nova/api/ec2/metadatarequesthandler.py

nova/api/rackspace/__init__.py

nova/api/rackspace/auth.py

nova/auth/manager.py

nova/cloudpipe/pipelib.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/scheduler/driver.py

nova/tests/access_unittest.py

nova/tests/api/__init__.py

nova/tests/api/rackspace/auth.py

nova/tests/api/rackspace/test_helper.py

nova/tests/api_unittest.py

nova/tests/cloud_unittest.py

Older »