We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 52a25e3 commit e5504a6Copy full SHA for e5504a6
1 file changed
etc/kayobe/stackhpc.yml
@@ -175,6 +175,7 @@ stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
175
<<<<<<< HEAD
176
177
178
+<<<<<<< HEAD
179
stackhpc_kolla_source_version: stackhpc/20.2.0.4
180
=======
181
stackhpc_kolla_source_version: stackhpc/18.7.0.11
@@ -191,6 +192,9 @@ stackhpc_kolla_source_version: stackhpc/18.8.0.1
191
192
193
stackhpc_kolla_source_version: stackhpc/18.8.0.2
194
>>>>>>> 50cf6845 (Bump kolla to stackhpc/18.8.0.2)
195
+=======
196
+stackhpc_kolla_source_version: stackhpc/18.8.0.3
197
+>>>>>>> fb12106a (Bump kolla to stackhpc/18.8.0.3)
198
199
# Kolla Ansible source repository.
200
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
0 commit comments