← Back to branch summary

~vishvananda/nova/move-ip-allocation

~vishvananda/nova/move-ip-allocation

Viewing all changes in revision 481.

Committer: Vishvananda Ishaya
Date: 2010-12-22 21:21:56 UTC
mfrom: (469.1.12 nova)
Revision ID: vishvananda@gmail.com-20101222212156-46fw1aem0mye32em

fixed more conflicts

files added:
CA/genvpn.sh

nova/fakememcache.py

nova/tests/middleware_unittest.py

files removed:
nova/api/cloudpipe

nova/api/cloudpipe/__init__.py

files renamed:
CA/INTER/ => CA/projects/

nova/cloudpipe/bootscript.sh => nova/cloudpipe/bootscript.template

files modified:
Authors

CA/geninter.sh

CA/genrootca.sh

CA/openssl.cnf.tmpl

bin/nova-manage

doc/ext/nova_autodoc.py

nova/api/__init__.py

nova/api/ec2/__init__.py

nova/api/ec2/cloud.py

nova/auth/manager.py

nova/cloudpipe/pipelib.py

nova/compute/api.py

nova/crypto.py

nova/db/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/flags.py

nova/network/linux_net.py

nova/tests/auth_unittest.py

nova/utils.py

run_tests.py

Show diffs side-by-side

added added

removed removed

CA/genrootca.sh

CA/openssl.cnf.tmpl

bin/nova-manage

doc/ext/nova_autodoc.py

nova/api/__init__.py

nova/api/cloudpipe/

nova/api/cloudpipe/__init__.py

nova/api/ec2/__init__.py

nova/api/ec2/cloud.py

nova/auth/manager.py

nova/cloudpipe/bootscript.template

nova/cloudpipe/pipelib.py

nova/compute/api.py

nova/db/sqlalchemy/api.py

nova/db/sqlalchemy/models.py

nova/fakememcache.py

nova/network/linux_net.py

nova/tests/auth_unittest.py

nova/tests/middleware_unittest.py

Older »