Evgeniy L 05b9819f1f Merge remote-tracking branch 'origin/master' into deployment-2 ... Conflicts: example.py resources/mariadb_service/actions/run.yml		2015-06-03 10:41:16 +02:00
..
actions	Merge branch 'master' into glance	2015-06-02 07:51:57 +02:00
meta.yaml	Add generation of keystone user, role, tenant, endpoint	2015-06-02 16:46:44 +02:00