Revision 82320e9e
ID | 82320e9e16842f0ac9ff7766104bf2d56e3ec6ef |
Merge branch 'master' of https://code.grnet.gr/git/synnefo into api-current
Conflicts:
snf-cyclades-app/synnefo/api/actions.py
snf-cyclades-app/synnefo/api/management/commands/createflavor.py
snf-cyclades-app/synnefo/api/management/commands/listflavors.py
snf-cyclades-app/synnefo/api/management/commands/listservers.py
snf-cyclades-app/synnefo/api/management/commands/modifyflavor.py
snf-cyclades-app/synnefo/api/management/commands/modifyserver.py
snf-cyclades-app/synnefo/api/management/commands/showserver.py
snf-cyclades-app/synnefo/tools/admin.py
Files
- added
- modified
- copied
- renamed
- deleted