circle/occi/occi.py · aff5f70f1af5eec7510a9fc4d6188b50c37a3929 · Fukász Rómeó Ervin / cloud

Merge branch 'feature-occi' into feature-voms-occi · aff5f70f

Conflicts:
	circle/circle/settings/base.py
	circle/circle/urls.py
	circle/occi/occi.py
	circle/occi/templates/occi/compute.html
	circle/occi/urls.py
	circle/occi/views.py

committed Oct 27, 2014

aff5f70f

occi.py 6.6 KB