Skip to content
  • Christos Stavrakakis's avatar
    Merge branch 'master' into develop · 97fae162
    Christos Stavrakakis authored
    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
    97fae162
To find the state of this project's repository at the time of any of these versions, check out the tags.