circle/dashboard/tests/test_views.py · 79aeec8092f6c48a5567c98f620952ccbe8c2cff · 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

test_views.py 69.4 KB