Merge branch 'ceph' into new_ceph
Conflicts: circle/dashboard/views/storage.py circle/storage/models.py circle/storage/tasks/periodic_tasks.py circle/storage/tasks/storage_tasks.py circle/vm/models/instance.py
A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/
Conflicts: circle/dashboard/views/storage.py circle/storage/models.py circle/storage/tasks/periodic_tasks.py circle/storage/tasks/storage_tasks.py circle/vm/models/instance.py