From 76f3594cb06246d5e48f25015f61d7f5eeaa212f Mon Sep 17 00:00:00 2001 From: radoslawszulgo Date: Wed, 12 Nov 2025 15:35:06 +0100 Subject: [PATCH] Remove merging issues in Update S3 storage documentation for TLS usage removed merging leftovers --- docs/details/s3-storage.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/details/s3-storage.md b/docs/details/s3-storage.md index 3acd9ddb..6f1d5228 100644 --- a/docs/details/s3-storage.md +++ b/docs/details/s3-storage.md @@ -150,8 +150,6 @@ retryer: This upload retry increases the chances of data upload completion in cases of unstable connection. -<<<<<<< HEAD -======= ## Data upload to storage with self-signed TLS certificates Percona Backup for MongoDB supports data upload to S3-compatible storage service over HTTPS with a self-signed or a private CA certificate. This feature is especially important when you use services like MinIO, Ceph, or internal S3 gateways that don't use certificates signed by public Certificate Authorities (CAs). @@ -203,6 +201,4 @@ pbm config --set storage.s3.insecureSkipTLSVerify=True !!! warning Use this option with caution as it might leave a hole for man-in-the-middle attacks. ->>>>>>> Removed prompt sign from code blocks -