← Back to branch summary

~usc-isi/nova/instance_type_extra_specs

~usc-isi/nova/instance_type_extra_specs

Viewing all changes in revision 145.3.1.

Committer: Ewan Mellor
Date: 2010-08-09 11:10:27 UTC
mfrom: (212 trunk)
mto: (145.4.1 add-contains)
mto: This revision was merged to the branch mainline in revision 221.
Revision ID: ewan.mellor@citrix.com-20100809111027-xbdyu44l6nb68bvp

Merged with trunk again.

files added:
nova/network/vpn.py

pylintrc

files renamed:
nova/compute/exception.py => nova/network/exception.py

nova/compute/linux_net.py => nova/network/linux_net.py

nova/compute/network.py => nova/network/model.py

files modified:
bin/nova-dhcpbridge

bin/nova-manage

bin/nova-network

nova/auth/fakeldap.py

nova/auth/ldapdriver.py

nova/auth/manager.py

nova/auth/signer.py

nova/compute/libvirt.xml.template

nova/compute/model.py

nova/compute/service.py

nova/datastore.py

nova/endpoint/cloud.py

nova/endpoint/images.py

nova/network/service.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/rpc.py

nova/tests/auth_unittest.py

nova/tests/model_unittest.py

nova/tests/network_unittest.py

nova/tests/objectstore_unittest.py

nova/tests/volume_unittest.py

nova/utils.py

nova/virt/images.py

nova/virt/libvirt_conn.py

nova/volume/service.py

Show diffs side-by-side

added added

removed removed

bin/nova-dhcpbridge

bin/nova-manage

bin/nova-network

nova/auth/fakeldap.py

nova/auth/ldapdriver.py

nova/auth/manager.py

nova/auth/signer.py

nova/compute/libvirt.xml.template

nova/compute/model.py

nova/compute/service.py

nova/datastore.py

nova/endpoint/cloud.py

nova/endpoint/images.py

nova/network/exception.py

nova/network/model.py

nova/network/service.py

nova/network/vpn.py

nova/objectstore/handler.py

nova/objectstore/image.py

nova/tests/auth_unittest.py

nova/tests/model_unittest.py

nova/tests/network_unittest.py

nova/tests/objectstore_unittest.py

nova/tests/volume_unittest.py

nova/virt/images.py

nova/virt/libvirt_conn.py

nova/volume/service.py

Older »