scality / Arsenal

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

ARSN-351 Backport existing lifecycle listing optimization to development/7.70 #2151

Closed nicolas2bert closed 1 year ago

nicolas2bert commented 1 year ago

Note: This code has already been reviewed and backported from the Arsenal development/8.1 branch.

bert-e commented 1 year ago

Hello nicolas2bert,

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 1 year ago

Incorrect fix version

The Fix Version/s in issue ARSN-351 contains:

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

Please check the Fix Version/s of ARSN-351, or the target branch of this pull request.

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/ARSN-351/backport with contents from improvement/ARSN-351/backport 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-351/backport origin/development/8.1
 $ git merge origin/improvement/ARSN-351/backport
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-351/backport
bert-e commented 1 year ago

Waiting for approval

The following approvals are needed before I can proceed with the merge:

bert-e commented 1 year ago

History mismatch

Merge commit #ae449840330df1ab5818e01d024e17074398ca6f on the integration branch w/8.1/improvement/ARSN-351/backport is merging a branch which is neither the current branch improvement/ARSN-351/backport nor the development branch development/8.1.

It is likely due to a rebase of the branch improvement/ARSN-351/backport and the merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

bert-e commented 1 year ago

History mismatch

Merge commit #ae449840330df1ab5818e01d024e17074398ca6f on the integration branch w/8.1/improvement/ARSN-351/backport is merging a branch which is neither the current branch improvement/ARSN-351/backport nor the development branch development/8.1.

It is likely due to a rebase of the branch improvement/ARSN-351/backport and the merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve

nicolas2bert commented 1 year ago

@bert-e reset

bert-e commented 1 year ago

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/ARSN-351/backport with contents from improvement/ARSN-351/backport 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-351/backport origin/development/8.1
 $ git merge origin/improvement/ARSN-351/backport
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/ARSN-351/backport
bert-e commented 1 year ago

Waiting for approval

The following approvals are needed before I can proceed with the merge:

nicolas2bert commented 1 year ago

@bert-e approve

bert-e commented 1 year ago

Build failed

The build for commit did not succeed in branch w/8.1/improvement/ARSN-351/backport.

The following options are set: approve

bert-e commented 1 year 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 1 year 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-351.

Goodbye nicolas2bert.