• Stavros Sachtouris's avatar
    Merge remote-tracking branch 'origin/master' · 381a637b
    Stavros Sachtouris authored
    Conflicts:
    	docs/index.rst
    	setup.py
    	snfOCCI/APIserver.py
    	snfOCCI/__init__.py
    	snfOCCI/compute.py
    	snfOCCI/config.py
    	snfOCCI/httpd/snf_voms-paste.ini
    	snfOCCI/httpd/snf_voms.py
    	snfOCCI/httpd/snf_voms_auth-paste.ini
    	snfOCCI/httpd/snf_voms_auth.py
    	snfOCCI/network.py
    	snfOCCI/registry.py
    381a637b
.gitignore 43 Bytes