Skip to content

CIRCLE / cloud

Go to a project
Commit 79aeec80 by Czémán Arnold
Options

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
parents 4413e841 ad35a055
Pipeline #134 passed with stage
in 0 seconds