circle/dashboard/tests · c77c627dbd31c721e146088de878d8a6ecef0b66 · Gyuricska Milán / cloud

Merge branch 'master' into ceph · a97fd1bc

Conflicts:
	circle/dashboard/management/commands/init.py
	circle/dashboard/templates/dashboard/storage/detail.html
	circle/dashboard/views/vm.py
	circle/storage/models.py
	requirements/base.txt

committed Dec 11, 2017

a97fd1bc

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...