History | View | Annotate | Download (33 Bytes)
Merge branch 'hotfix-0.14.10' into develop
Conflicts: Changelog 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/management/commands/reconcile-networks.py...
Bump version to 0.14.10rc1
Merge branch 'master' into develop
Conflicts: Changelog astakosclient/astakosclient/keypath.py ci/utils.py docs/admin-guide.rst snf-astakos-app/astakos/im/cookie.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/quotas.py snf-astakos-app/astakos/im/views/projects.py...
Bump version to 0.14.9
Bump version to 0.14.9rc1
Bump version to 0.14.8
Merge branch 'hotfix-0.14.8' into develop
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...
Bump version to 0.14.8rc1
Conflicts: Changelog version
Bump version to 0.14.7
Merge branch 'hotfix-0.14.6' into develop
Conflicts: Changelog docs/admin-guide.rst snf-cyclades-app/synnefo/api/management/commands/network-remove.py snf-cyclades-app/synnefo/api/servers.py snf-cyclades-app/synnefo/api/tests/servers.py snf-cyclades-app/synnefo/logic/backend.py...
Bump version to 0.14.6
Bump version to 0.14.6rc3
Bump version to 0.14.6rc2
Bump up version to 0.14.6rc1
Merge branch 'hotfix-0.14.5' into develop
Conflicts: snf-pithos-backend/pithos/backends/modular.py version
Bump version to 0.14.5
Merge branch 'hotfix-0.14.4' into develop
Bump version to 0.14.4
Merge branch 'hotfix-0.14.3' into develop
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-pithos-app/pithos/api/manage_accounts/__init__.py snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py snf-pithos-app/pithos/api/settings.py...
Bump version to 0.14.3
Merge branch 'hotfix-0.14.2' into develop
Conflicts: snf-astakos-app/astakos/im/views/projects.py snf-cyclades-app/synnefo/logic/backend.py snf-django-lib/snf_django/lib/astakos.py version
Bump version to 0.14.2
Bump version to 0.14.1
Merge branch 'release-0.14'
Conflicts: version
Bump version to 0.14rc6
Bump version to 0.14rc5
Bump version to 0.14rc4
Bump version to 0.14rc3
Bump version to 0.14rc2
Bump version to 0.14next
Bump version to 0.14rc1
Bump version to 0.13
Bump version
Bump version to 0.13rc7
Bump version to 0.13rc6
Fix devflow version
Bump version to 0.13rc5
Bump version to 0.13rc4
Bump version to 0.13rc3
Bump version to 0.13rc2
Restore version to 0.13rc1
Fix version
WIP commit for the devtools build system