Skip to content

Commit 9cc0e96

Browse files
committed
Fixing merge conflict
1 parent 8b9630f commit 9cc0e96

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

deploy-manage/tools/snapshot-and-restore/cloud-enterprise.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ To configure Google Cloud Storage (GCS) as a snapshot repository, you must use [
2828

2929
To configure Microsoft Azure Storage as a snapshot repository, refer to [Snapshotting to Azure Storage](azure-storage-repository.md).
3030

31-
<<<<<<< HEAD
32-
For more details about how snapshots are used with Elasticsearch, check [Snapshot and restore](/deploy-manage/tools/snapshot-and-restore.md). You can also review the official documentation for these storage repository options:
33-
=======
34-
For more details about how snapshots are used with Elasticsearch, check [Snapshot and Restore](/deploy-manage/tools/snapshot-and-restore.md). You can also review the official documentation for these storage repository options:
35-
>>>>>>> 0491a1f86c6b651663641c0c8b292a85dfcdcc6a
36-
3731
* [Amazon S3 documentation](https://docs.aws.amazon.com/s3/)
3832
* [Microsoft Azure storage documentation](https://docs.microsoft.com/en-us/azure/storage/common/storage-quickstart-create-account)
3933
* [Google Cloud Storage documentation](https://cloud.google.com/storage/docs/)
@@ -47,9 +41,9 @@ If you are installing ECE without internet access (commonly called an offline or
4741

4842
The following guides provide instructions on adding a snapshot repository in ECE for all supported types:
4943

44+
* [AWS S3](/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md)
5045
* [Azure](/deploy-manage/tools/snapshot-and-restore/azure-storage-repository.md)
5146
* [Google Cloud Storage](/deploy-manage/tools/snapshot-and-restore/google-cloud-storage-gcs-repository.md)
52-
* [AWS S3](/deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md)
5347
* [Minio](/deploy-manage/tools/snapshot-and-restore/minio-on-premise-repository.md)
5448

5549
## Edit snapshot repository configurations [ece_edit_snapshot_repository_configurations]

deploy-manage/tools/snapshot-and-restore/ece-aws-custom-repository.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
navigation_title: "AWS S3 repository"
3+
24
applies_to:
35
deployment:
46
eck:

0 commit comments

Comments
 (0)