File tree Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Expand file tree Collapse file tree 1 file changed +4
-0
lines changed Original file line number Diff line number Diff line change @@ -184,13 +184,17 @@ stackhpc_kolla_source_version: stackhpc/18.7.0.12
184184stackhpc_kolla_ansible_source_url : " https://github.com/stackhpc/kolla-ansible"
185185<<<<<<< HEAD
186186<<<<<<< HEAD
187+ <<<<<<< HEAD
187188stackhpc_kolla_ansible_source_version : stackhpc/20.2.0.9
188189=======
189190stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.12
190191>>>>>>> eb557894 (Bump kolla-ansible to stackhpc/18.7.0.12)
191192=======
192193stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.13
193194>>>>>>> 51b66c70 (Bump kolla-ansible to stackhpc/18.7.0.13)
195+ =======
196+ stackhpc_kolla_ansible_source_version : stackhpc/18.7.0.14
197+ >>>>>>> 5eb18c86 (Bump kolla-ansible to stackhpc/18.7.0.14 (#1856))
194198
195199# ##############################################################################
196200# Container image registry
You can’t perform that action at this time.
0 commit comments