Skip to content

fix(s3): fix rebase error #3905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 29, 2024
Merged

fix(s3): fix rebase error #3905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2d4bc
fix(s3): fix rebase error
SamyOubouaziz Oct 29, 2024
af96bbd
fix(s3): fix build error
SamyOubouaziz Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion serverless/jobs/quickstart.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 name="more"> icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs.
4. Click the <Icon name="more" /> icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs.

<Message type="note">
Make sure that you [have retrieved your Grafana credentials](/observability/cockpit/how-to/retrieve-grafana-credentials/) before accessing your job's logs.
Expand Down
6 changes: 1 addition & 5 deletions storage/object/concepts.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down