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 @@ -173,6 +173,7 @@ stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
173173<<<<<<< HEAD
174174<<<<<<< HEAD
175175<<<<<<< HEAD
176+ <<<<<<< HEAD
176177stackhpc_kolla_source_version : stackhpc/20.2.0.4
177178=======
178179stackhpc_kolla_source_version : stackhpc/18.7.0.11
@@ -183,6 +184,9 @@ stackhpc_kolla_source_version: stackhpc/18.7.0.12
183184=======
184185stackhpc_kolla_source_version : stackhpc/18.7.0.13
185186>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
187+ =======
188+ stackhpc_kolla_source_version : stackhpc/18.8.0.1
189+ >>>>>>> 82c628b3 (Bump kolla to stackhpc/18.8.0.1)
186190
187191# Kolla Ansible source repository.
188192stackhpc_kolla_ansible_source_url : " https://github.com/stackhpc/kolla-ansible"
You can’t perform that action at this time.
0 commit comments