Resolve the conflicting files from master
Signed-off-by: David Ko <dko@suse.com>
This commit is contained in:
commit
b6b6e4824d
@ -957,6 +957,7 @@ data:
|
||||
numberOfReplicas: "3"
|
||||
staleReplicaTimeout: "2880"
|
||||
fromBackup: ""
|
||||
fsType: "ext4"
|
||||
# backingImage: "bi-test"
|
||||
# backingImageDataSourceType: "download"
|
||||
# backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}'
|
||||
|
@ -10,6 +10,7 @@ parameters:
|
||||
numberOfReplicas: "2"
|
||||
staleReplicaTimeout: "2880"
|
||||
fromBackup: ""
|
||||
fsType: "ext4"
|
||||
# backingImage: "bi-test"
|
||||
# backingImageDataSourceType: "download"
|
||||
# backingImageDataSourceParameters: '{"url": "https://backing-image-example.s3-region.amazonaws.com/test-backing-image"}'
|
||||
|
Loading…
Reference in New Issue
Block a user