History | View | Annotate | Download (7.2 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...
astakos: Add missing cyclades service in script
pithos: Clear pithos_public endpoint's versionId
pithos_public service is not an API and should not be versioned; thepublic URLs operated by pithos do not include a version segment, anyway.
Also make its type more specific, since type `public' is too generic.
astakos: Update cyclades services in helper script
astakos: Update pithos_public definition in script
astakos: Update pithos_public in helper script
astakos: Add weblogin definition in helper script
Rename astakos_keystone to astakos_identity
astakos: Automate registering components
Add script snf-register-components and helper snf-service-export.