File tree Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Expand file tree Collapse file tree 2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -62,7 +62,11 @@ metadata:
6262 capabilities : Auto Pilot
6363 categories : Application Runtime
6464 containerImage : icr.io/cpopen/websphere-liberty-operator:daily
65+ <<<<<<< HEAD
6566 createdAt : " 2023-11-02T15:00:01Z"
67+ =======
68+ createdAt : " 2023-11-02T15:05:35Z"
69+ >>>>>>> 5fe4225 (Fixed displayName typos)
6670 description : Deploy and manage containerized Liberty applications
6771 olm.skipRange : ' >=1.0.0 <1.3.0'
6872 operators.openshift.io/infrastructure-features : ' ["disconnected"]'
@@ -740,12 +744,12 @@ spec:
740744 - displayName : Partition
741745 path : statefulSet.updateStrategy.rollingUpdate.partition
742746 - displayName : Type
743- path : statefulSet.updateStrategy.typekube
747+ path : statefulSet.updateStrategy.type
744748 - displayName : API Version
745749 path : statefulSet.storage.volumeClaimTemplate.apiVersion
746750 - displayName : Kind
747751 path : statefulSet.storage.volumeClaimTemplate.kind
748- - displayName : Metadate
752+ - displayName : Metadata
749753 path : statefulSet.storage.volumeClaimTemplate.metadata
750754 - displayName : Spec
751755 path : statefulSet.storage.volumeClaimTemplate.spec
Original file line number Diff line number Diff line change 226226 path : /spec/customresourcedefinitions/owned/0/specDescriptors/-
227227 value :
228228 displayName : Type
229- path : statefulSet.updateStrategy.typekube
229+ path : statefulSet.updateStrategy.type
230230- op : add
231231 path : /spec/customresourcedefinitions/owned/0/specDescriptors/-
232232 value :
240240- op : add
241241 path : /spec/customresourcedefinitions/owned/0/specDescriptors/-
242242 value :
243- displayName : Metadate
243+ displayName : Metadata
244244 path : statefulSet.storage.volumeClaimTemplate.metadata
245245- op : add
246246 path : /spec/customresourcedefinitions/owned/0/specDescriptors/-
You can’t perform that action at this time.
0 commit comments