-
Christos Stavrakakis authored
Conflicts: Changelog snf-cyclades-app/synnefo/api/servers.py snf-cyclades-app/synnefo/logic/backend.py snf-cyclades-app/synnefo/logic/callbacks.py snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py snf-cyclades-app/synnefo/logic/reconciliation.py snf-cyclades-gtools/synnefo/ganeti/eventd.py version
b90016cb