Merge branch 'master' into merge-master-arno 96/1396/1
[genesis.git] / compass / deploy / ansible / roles / glance / templates /
drwxr-xr-x   ..
-rw-r--r-- 24455 glance-api.conf
-rw-r--r-- 6085 glance-registry.conf
-rw-r--r-- 291 image_upload.sh