History | View | Annotate | Download (10.8 kB)
Merge remote-tracking branch 'origin/master' into astakos-integration
Conflicts: snf-cyclades-app/synnefo/api/util.py
Update the Flavor's unique_together constraint
A DB migration is required.
Conflicts: runtests.sh snf-cyclades-app/synnefo/aai/__init__.py snf-cyclades-app/synnefo/aai/fixtures/auth_test_data.json snf-cyclades-app/synnefo/aai/middleware.py snf-cyclades-app/synnefo/aai/models.py...
Renamed snf-app to snf-cyclades-app