Merge branch 'feature-fix-service-version-numbers' into feature-reconfigure-settings
Conflicts: snf-astakos-app/astakos/im/tests/api.py snf-common/synnefo/lib/services.py snf-cyclades-app/synnefo/api/tests/flavors.py snf-cyclades-app/synnefo/api/tests/images.py...
Merge branch 'develop' into feature-reconfigure-settings
Conflicts: snf-astakos-app/astakos/im/tests/api.py snf-astakos-app/astakos/urls.py snf-cyclades-app/synnefo/api/test/servers.py snf-cyclades-app/synnefo/api/tests/networks.py snf-cyclades-app/synnefo/app_settings/urls.py...
Remove 'v' from service version IDs, keep it in URLs
- Openstack versionId does not have a leading 'v' as in 'v1.0', but is just '1.0'. URLs do have the 'v'.
- Compute is v2 instead of v2.0
- some more version-related fixes
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: Fix tests to run with sqlalchemy backend/sqlite engine
pep8 changes
Merge branch 'feature-pithos-atomic-api' into develop
pithos: Fix test configuration
pithos: Cleanup api_method code
pithos: Restore sqlite backend module
View revisions
Also available in: Atom