History | View | Annotate | Download (15.9 kB)
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...
pithos: Fix pithos-manage-account command
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...
Revert "pithos: manage_accounts support for both sqlalchemy and sqlite"
This reverts commit 8414859f4895e4c67ff0bb13a8d7078c1851596a.
This commit with the current backend implementationhas broken the command for sqlalchemy module.
pithos: Handle backend transaction management
In commit 9f135224edf6e50386dc29e0a35806a92c56a50cthe transaction management has been movedfrom the pithos backend to pithos frontend.This commit updates all modules use pithos backendto handle transactions manually.
pithos: return always etag
Refs: #3554
If update md5 is deactivated Pithos does not return an etag header.Pithos in that case should return the merkle hash as etag
pithos: Update pithos management commands
Refs: #3625
pithos: manage_accounts support for both sqlalchemy and sqlite