| commit | 264fefef58cbed6f7285adb634e317f1e9bfe4d4 | [log] [tgz] |
|---|---|---|
| author | Federico Ressi <fressi@redhat.com> | Wed Feb 28 07:34:52 2018 +0100 |
| committer | Federico Ressi <fressi@redhat.com> | Wed Feb 28 07:34:52 2018 +0100 |
| tree | 5c20ff3d6c7cd84ee2b81e78f7830606a580158a | |
| parent | 0ce87ee5669de51b71d45bc1afa2126db088e813 [diff] | |
| parent | 5c61ac60172363510d90d5a60965adb94cd4477a [diff] |
Merge branch 'osp-11' Conflicts: 20-overcloud-images.yml 31-overcloud-templates.yml