circle/dashboard/tests · ef1332c626a2946d030ed7e5f65861ee9e6ccda2 · Gyuricska Milán / 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
..
selenium		Loading commit data...
__init__.py		Loading commit data...
test_mockedviews.py		Loading commit data...
test_models.py		Loading commit data...
test_periodic_task.py		Loading commit data...
test_templates.py		Loading commit data...
test_views.py		Loading commit data...