-
Christos Stavrakakis authored
Merge hotfix-0.14.8 which ports Synnefo to wheezy and Django 1.4.5 Conflicts: ci/ci_squeeze.conf ci/ci_wheezy.conf ci/schemas/one_node_squeeze/packages.conf ci/schemas/one_node_squeeze/squeeze.conf ci/schemas/one_node_squeeze/wheezy.conf ci/schemas/one_node_wheezy/packages.conf ci/schemas/one_node_wheezy/squeeze.conf ci/schemas/one_node_wheezy/wheezy.conf ci/tests.sh ci/utils.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/tests/projects.py snf-astakos-app/astakos/im/views/im.py snf-astakos-app/astakos/im/weblogin_urls.py snf-astakos-app/astakos/urls.py snf-astakos-app/setup.py snf-cyclades-app/synnefo/api/networks.py snf-cyclades-app/synnefo/api/tests/flavors.py snf-cyclades-app/synnefo/app_settings/urls.py snf-cyclades-app/synnefo/logic/management/commands/reconcile-networks.py snf-cyclades-app/synnefo/logic/tests/callbacks.py snf-deploy/conf/packages.conf snf-deploy/conf/squeeze.conf snf-deploy/conf/wheezy.conf snf-deploy/fabfile.py snf-deploy/files/etc/apt/sources.list.d/synnefo.squeeze.list snf-deploy/files/etc/apt/sources.list.d/synnefo.wheezy.list snf-deploy/files/etc/synnefo/webproject.conf snf-django-lib/snf_django/lib/api/__init__.py snf-django-lib/snf_django/lib/api/urls.py snf-django-lib/snf_django/utils/testing.py snf-pithos-app/setup.py snf-stats-app/synnefo_stats/urls.py version
bf9d6a8f