Merge branch 'feature-snf-django' into develop
Conflicts: docs/older/Changelog.pithos-app snf-astakos-app/astakos/im/api/__init__.py snf-pithos-app/pithos/api/util.py
Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Fix create vm view images filtering in cyclades ui
use the new synnefo.user method `get_username` to populatepersonal/shared images.
Move astakos lib from snf-common to snf-django-lib
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views.py version
Remove ui debug statement
Merge branch 'tmp-common-email-recipients' into develop
Merge branch 'feature-astakos-authpolicies' into develop
Conflicts: snf-cyclades-app/synnefo/api/management/commands/flavor-create.py version
UI auth module typo fix
fix get_username to return user uuid instead of user token. The changefix the resolving of image ownership of the current ui user.
UI create vm errors fix
never forget to pass vm create callback arguments
View revisions
Also available in: Atom