Revision ee995ae2
| ID | ee995ae27300b9da1ab7bea32fe9a6bf3786365f |
Merge branch 'master' into develop
Conflicts:
ci/schemas/one_node_wheezy/wheezy.conf
docs/admin-guide.rst
snf-cyclades-app/synnefo/api/actions.py
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/rapi.py
snf-cyclades-app/synnefo/logic/reconciliation.py
snf-cyclades-gtools/synnefo/ganeti/eventd.py
snf-deploy/conf/packages.conf
snf-deploy/conf/wheezy.conf
snf-deploy/snfdeploy/__init__.py
version
Files
- added
- modified
- copied
- renamed
- deleted