From dc2d4bcf77336551cf439963c0a27b089c930e79 Mon Sep 17 00:00:00 2001 From: SamyOubouaziz Date: Tue, 29 Oct 2024 11:16:57 +0100 Subject: [PATCH 1/2] fix(s3): fix rebase error --- storage/object/concepts.mdx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/storage/object/concepts.mdx b/storage/object/concepts.mdx index afc5365c21..5efe1d4848 100644 --- a/storage/object/concepts.mdx +++ b/storage/object/concepts.mdx @@ -15,11 +15,7 @@ categories: ## Access control list (ACL) -<<<<<<< HEAD -Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Amazon S3 checks its ACL and verifies that they have permission to carry out the request. -======= -Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Object Storage checks its ACL and verifies that they have permission to carry out the request. ->>>>>>> 8888c6b0f (feat(gen): remove mentions of S3 only) +control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Amazon S3 checks its ACL and verifies that they have permission to carry out the request. ## Bucket From af96bbdec4c5d2055d9cbd45da04c2b86f995676 Mon Sep 17 00:00:00 2001 From: SamyOubouaziz Date: Tue, 29 Oct 2024 11:36:30 +0100 Subject: [PATCH 2/2] fix(s3): fix build error --- serverless/jobs/quickstart.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverless/jobs/quickstart.mdx b/serverless/jobs/quickstart.mdx index 954a5ad39c..d575d0d01c 100644 --- a/serverless/jobs/quickstart.mdx +++ b/serverless/jobs/quickstart.mdx @@ -64,7 +64,7 @@ This page explains how to create a job definition with the latest Alpine Linux i The execution appears in the **Job runs** section of the **Overview** tab. -4. Click the icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs. +4. Click the icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs. Make sure that you [have retrieved your Grafana credentials](/observability/cockpit/how-to/retrieve-grafana-credentials/) before accessing your job's logs.