Merge branch 'master' into merge-master-arno 96/1396/1
[genesis.git] / compass / deploy / ansible / roles / cinder-volume / templates /
drwxr-xr-x   ..
-rw-r--r-- 1527 cinder.conf