circle/request · ceph · Gelencsér Szabolcs / cloud

Merge branch 'ceph' into new_ceph · 79aeec80

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

committed Jul 12, 2016

79aeec80

Name	Last commit	Last Update
..
migrations		Loading commit data...
templates/request		Loading commit data...
__init__.py		Loading commit data...
forms.py		Loading commit data...
models.py		Loading commit data...
tables.py		Loading commit data...
tests.py		Loading commit data...
urls.py		Loading commit data...
views.py		Loading commit data...