search

scality / Arsenal

Common utilities for the open-source Scality S3 project components
Apache License 2.0
15 stars 19 forks source link

ARSN-390: Add scuba arn for policy #2212

Closed BourgoisMickael closed 9 months ago

BourgoisMickael commented 9 months ago

Relates to Scuba Auth: SCUBA-76 and SCUBA-77

This will be used by:

bert-e commented 9 months ago

Hello bourgoismickael,

My role is to assist you with the merge of this pull request. Please type @bert-e help to get information on this process, or consult the user documentation.

Status report is not available.

bert-e commented 9 months ago

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically create the integration branches.

BourgoisMickael commented 9 months ago

/approve

bert-e commented 9 months ago

Conflict

A conflict has been raised during the creation of integration branch w/7.70/improvement/ARSN-390-scuba-arn with contents from improvement/ARSN-390-scuba-arn and development/7.70.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/7.70/improvement/ARSN-390-scuba-arn origin/development/7.70
 $ git merge origin/improvement/ARSN-390-scuba-arn
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/ARSN-390-scuba-arn

The following options are set: approve

bert-e commented 9 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/ARSN-390-scuba-arn with contents from w/7.70/improvement/ARSN-390-scuba-arn and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/ARSN-390-scuba-arn origin/development/8.1
 $ git merge origin/w/7.70/improvement/ARSN-390-scuba-arn
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-390-scuba-arn

The following options are set: approve

bert-e commented 9 months ago

In the queue

The changeset has received all authorizations and has been added to the relevant queue(s). The queue(s) will be merged in the target development branch(es) as soon as builds have passed.

The changeset will be merged in:

The following branches will NOT be impacted:

There is no action required on your side. You will be notified here once the changeset has been merged. In the unlikely event that the changeset fails permanently on the queue, a member of the admin team will contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

If you need this pull request to be removed from the queue, please contact a member of the admin team now.

The following options are set: approve

bert-e commented 9 months ago

I have successfully merged the changeset of this pull request into targetted development branches:

The following branches have NOT changed:

Please check the status of the associated issue ARSN-390.

Goodbye bourgoismickael.