Merge branch 'master' of https://code.grnet.gr/git/synnefo into api-current
Conflicts: api/images.py api/networks.py contrib/ganeti-hooks/kvm-vif-bridge db/fixtures/images.json db/models.py logic/backend.py logic/tests.py settings.py.dist tools/cloud
Add a public attribute to Images
list_images now returns images that either match the owner, orthat are marked as public.
Fixes #555
Database migration needed.
Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
Merge branch 'images-0.4'
Make Network and NetworkLink relation explicit
DB migration needed.
Bugfixes
Connect networks API with the Ganeti
A database migration is needed....
Allow owner in networks to be null
Database migration is needed.
Refactor networks
Add initial support for different Image formats
Initial support for choosing between different Image formats:
View revisions
Also available in: Atom