« Previous | Next » 

Revision 3a09d155

ID3a09d1554dc44655d582729fdb0389c3d62d5788

Added by Christos Stavrakakis almost 8 years ago

Merge branch 'hotfix-0.14.10' into develop

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted