Revision 6639a243
ID | 6639a2430e9123691c88f295fe4254ec79bce6c7 |
Merge branch 'master' into devel-0.12
Conflicts:
snf-cyclades-app/synnefo/api/management/commands/flavor-list.py
snf-cyclades-app/synnefo/api/management/commands/server-list.py
snf-cyclades-app/synnefo/api/networks.py
snf-cyclades-app/synnefo/logic/rapi.py
Files
- added
- modified
- copied
- renamed
- deleted