ivampiresp/longhorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merfigy conflict

Browse Source 
Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
This commit is contained in:
Chin-Ya Huang 2023-04-11 08:17:32 +08:00 committed by David Ko
parent 98e400dbde
commit 74c4a3644e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deploy/longhorn-images.txt
View File

@ -4,20 +4,10 @@ longhornio/csi-resizer:v1.3.0
longhornio/csi-snapshotter:v5.0.1
longhornio/csi-node-driver-registrar:v2.5.0
longhornio/livenessprobe:v2.8.0
<<<<<<< HEAD
longhornio/backing-image-manager:v1.4.1
longhornio/longhorn-engine:v1.4.1
longhornio/longhorn-instance-manager:v1.4.1
longhornio/longhorn-manager:v1.4.1
longhornio/longhorn-share-manager:v1.4.1
longhornio/longhorn-ui:v1.4.1
longhornio/support-bundle-kit:v0.0.20
=======
longhornio/backing-image-manager:master-head
longhornio/longhorn-engine:master-head
longhornio/longhorn-instance-manager:master-head
longhornio/longhorn-manager:master-head
longhornio/longhorn-share-manager:master-head
longhornio/longhorn-ui:master-head
longhornio/support-bundle-kit:v0.0.22
>>>>>>> 54e6163 (chore(support-bundle): version bump)