Revision a1dae38d

« Previous | Next »

ID	a1dae38d295d39f5c2dc8c113e4b6e3188968887

Added by Christos Stavrakakis over 7 years ago

Merge branch 'feature-cyclades-networks' into develop

Conflicts:
snf-cyclades-app/synnefo/api/management/commands/server-inspect.py
snf-cyclades-app/synnefo/app_settings/urls.py
snf-cyclades-app/synnefo/logic/backend.py
snf-cyclades-app/synnefo/logic/backend_allocator.py
snf-cyclades-app/synnefo/logic/management/commands/network-inspect.py
snf-cyclades-app/synnefo/logic/tests/servers.py
snf-cyclades-app/synnefo/quotas/util.py
snf-cyclades-app/synnefo/ui/views.py
snf-deploy/snfdeploy/__init__.py

Files

added
modified
copied
renamed
deleted