« Previous | Next » 

Revision a191bd4d

IDa191bd4da30fb7d508fb74859936ee026727b586

Added by Giorgos Verigakis over 12 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted