Merge branch 'feature-astakos-authpolicies' into develop
Conflicts: snf-cyclades-app/synnefo/api/management/commands/flavor-create.py version
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.