Skip to content

Commit 168a9ae

Browse files
committed
[conflicts] merge from fixed conflicts branch
Signed-off-by: IvanHunters <[email protected]>
2 parents 6023dff + 19b79b7 commit 168a9ae

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

‎packages/apps/versions_map‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ kafka 0.8.0 08cb7c0f
5959
kafka 0.8.1 HEAD
6060
kubernetes 0.24.0 62cb694d
6161
kubernetes 0.25.0 70f82667
62+
kubernetes 0.25.1 acd4663a
63+
kubernetes 0.25.2 08cb7c0f
6264
kubernetes 0.26.0 HEAD
6365
mysql 0.1.0 263e47be
6466
mysql 0.2.0 c24a103f
@@ -148,7 +150,8 @@ tcp-balancer 0.4.2 4369b031
148150
tcp-balancer 0.5.0 08cb7c0f
149151
tcp-balancer 0.5.1 HEAD
150152
tenant 1.10.0 4369b031
151-
tenant 1.11.0 HEAD
153+
tenant 1.11.0 08cb7c0f
154+
tenant 1.11.1 HEAD
152155
virtual-machine 0.1.4 f2015d65
153156
virtual-machine 0.1.5 263e47be
154157
virtual-machine 0.2.0 c0685f43
@@ -166,7 +169,8 @@ virtual-machine 0.9.1 93bdf411
166169
virtual-machine 0.10.0 6130f43d
167170
virtual-machine 0.10.2 632224a3
168171
virtual-machine 0.11.0 4369b031
169-
virtual-machine 0.12.0 HEAD
172+
virtual-machine 0.12.0 acd4663a
173+
virtual-machine 0.12.1 HEAD
170174
vm-disk 0.1.0 d971f2ff
171175
vm-disk 0.1.1 6130f43d
172176
vm-disk 0.1.2 632224a3
@@ -183,7 +187,8 @@ vm-instance 0.6.0 721c12a7
183187
vm-instance 0.7.0 6130f43d
184188
vm-instance 0.7.2 632224a3
185189
vm-instance 0.8.0 4369b031
186-
vm-instance 0.9.0 HEAD
190+
vm-instance 0.9.0 acd4663a
191+
vm-instance 0.10.0 HEAD
187192
vpn 0.1.0 263e47be
188193
vpn 0.2.0 53f2365e
189194
vpn 0.3.0 6c5cf5bf

0 commit comments

Comments
 (0)