Viewing all changes in revision 48.
- Committer: Mark Gius
- Date: 2011-05-23 20:35:27 UTC
- mfrom: (46.2.3 openstack-dashboard)
- Revision ID: launchpad@markgius.com-20110523203527-edohy69xc98heqem
Merging
- files added:
- django-openstack/src/django_openstack/core
- django-openstack/src/django_openstack/nova
- django-openstack/src/django_openstack/templates/admin/django_openstack/nova
- django-openstack/src/django_openstack/templates/django_openstack/nova
- django-openstack/src/django_openstack/templates/django_openstack/nova/credentials
- django-openstack/src/django_openstack/templates/django_openstack/nova/images
- django-openstack/src/django_openstack/templates/django_openstack/nova/instances
- django-openstack/src/django_openstack/templates/django_openstack/nova/instances/_instances_list.html
- django-openstack/src/django_openstack/templates/django_openstack/nova/keypairs
- django-openstack/src/django_openstack/templates/django_openstack/nova/projects
- django-openstack/src/django_openstack/templates/django_openstack/nova/securitygroups
- django-openstack/src/django_openstack/templates/django_openstack/nova/volumes
- django-openstack/src/django_openstack/templatetags
- django-openstack/src/django_openstack/templatetags/templatetags
- django-openstack/src/django_openstack/tests
- django-nova/src/django_nova/templates/django_nova/credentials
- django-nova/src/django_nova/templates/django_nova/images
- django-nova/src/django_nova/templates/django_nova/instances
- django-nova/src/django_nova/templates/django_nova/keypairs
- django-nova/src/django_nova/templates/django_nova/projects
- django-nova/src/django_nova/templates/django_nova/securitygroups
- django-nova/src/django_nova/templates/django_nova/volumes
- django-nova/src/django_nova/tests/view_tests
- files renamed:
- django-nova/ => django-openstack/
- django-nova/src/django_nova/ => django-openstack/src/django_openstack/
- django-nova/src/django_nova/connection.py => django-openstack/src/django_openstack/core/connection.py
- django-nova/src/django_nova/exceptions.py => django-openstack/src/django_openstack/nova/exceptions.py
- django-nova/src/django_nova/forms.py => django-openstack/src/django_openstack/nova/forms.py
- django-nova/src/django_nova/manager.py => django-openstack/src/django_openstack/nova/manager.py
- django-nova/src/django_nova/shortcuts.py => django-openstack/src/django_openstack/nova/shortcuts.py
- django-nova/src/django_nova/templatetags/ => django-openstack/src/django_openstack/nova/templatetags/
- django-nova/src/django_nova/tests/ => django-openstack/src/django_openstack/nova/tests/
- django-nova/src/django_nova/tests/view_tests/base.py => django-openstack/src/django_openstack/nova/tests/base.py
- django-nova/src/django_nova/tests/view_tests/credential_tests.py => django-openstack/src/django_openstack/nova/tests/credential_tests.py
- django-nova/src/django_nova/tests/view_tests/image_tests.py => django-openstack/src/django_openstack/nova/tests/image_tests.py
- django-nova/src/django_nova/tests/view_tests/instance_tests.py => django-openstack/src/django_openstack/nova/tests/instance_tests.py
- django-nova/src/django_nova/tests/view_tests/keypair_tests.py => django-openstack/src/django_openstack/nova/tests/keypair_tests.py
- django-nova/src/django_nova/tests/view_tests/region_tests.py => django-openstack/src/django_openstack/nova/tests/region_tests.py
- django-nova/src/django_nova/tests/view_tests/volume_tests.py => django-openstack/src/django_openstack/nova/tests/volume_tests.py
- django-nova/src/django_nova/urls/ => django-openstack/src/django_openstack/nova/urls/
- django-nova/src/django_nova/views/ => django-openstack/src/django_openstack/nova/views/
- django-nova/src/django_nova/templates/admin/django_nova/ => django-openstack/src/django_openstack/templates/admin/django_openstack/
- django-nova/src/django_nova/templates/admin/django_nova/project/ => django-openstack/src/django_openstack/templates/admin/django_openstack/nova/project/
- django-nova/src/django_nova/templates/django_nova/ => django-openstack/src/django_openstack/templates/django_openstack/
- django-nova/src/django_nova/templatetags/admin_extras.py => django-openstack/src/django_openstack/templatetags/templatetags/admin_extras.py
- django-nova/src/django_nova/templatetags/django_nova_tags.py => django-openstack/src/django_openstack/templatetags/templatetags/django_openstack_tags.py
- django-nova/src/django_nova/templatetags/sidebar_tags.py => django-openstack/src/django_openstack/templatetags/templatetags/sidebar_tags.py
- django-nova/src/django_nova/templatetags/truncate_filter.py => django-openstack/src/django_openstack/templatetags/templatetags/truncate_filter.py
- django-nova/src/django_nova/tests/templates/ => django-openstack/src/django_openstack/tests/templates/
- django-nova/src/django_nova/tests/urls.py => django-openstack/src/django_openstack/testurls.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
