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 @@ -174,6 +174,7 @@ stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
174174<<<<<<< HEAD
175175<<<<<<< HEAD
176176<<<<<<< HEAD
177+ <<<<<<< HEAD
177178stackhpc_kolla_source_version : stackhpc/20.2.0.4
178179=======
179180stackhpc_kolla_source_version : stackhpc/18.7.0.11
@@ -187,6 +188,9 @@ stackhpc_kolla_source_version: stackhpc/18.7.0.13
187188=======
188189stackhpc_kolla_source_version : stackhpc/18.8.0.1
189190>>>>>>> 82c628b3 (Bump kolla to stackhpc/18.8.0.1)
191+ =======
192+ stackhpc_kolla_source_version : stackhpc/18.8.0.2
193+ >>>>>>> 50cf6845 (Bump kolla to stackhpc/18.8.0.2)
190194
191195# Kolla Ansible source repository.
192196stackhpc_kolla_ansible_source_url : " https://github.com/stackhpc/kolla-ansible"
You can’t perform that action at this time.
0 commit comments