scality / backbeat

Zenko Backbeat is the core engine for asynchronous replication, optimized for queuing metadata updates and dispatching work to long-running tasks in the background.

https://www.zenko.io

Apache License 2.0

53 stars 19 forks source link

BB-353 - support s3:ObjectRestore:Post operation types in lifecycle #2355

Closed Kerkesni closed 1 year ago

Kerkesni commented 1 year ago

Issue: BB-353

bert-e commented 1 year ago

Hello kerkesni,

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 BB-353 contains:

None

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

8.6.1

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

bert-e commented 1 year ago

Incorrect fix version

The Fix Version/s in issue BB-353 contains:

None

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

8.5.4
8.6.1

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

bert-e commented 1 year ago

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/BB-353 into development/8.5
w/8.6/bugfix/BB-353 will be merged into development/8.6

The following branches will NOT be impacted:

development/7.10
development/7.4
development/8.3
development/8.4

You can set option create_pull_requests if you need me to create integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e commented 1 year ago

Waiting for approval

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

the author
2 peers

bert-e commented 1 year ago

History mismatch

Merge commit #5803302f00aedbe6fa4d78a1ed8c5a3b0306c643 on the integration branch w/8.6/bugfix/BB-353 is merging a branch which is neither the current branch bugfix/BB-353 nor the development branch development/8.6.

It is likely due to a rebase of the branch bugfix/BB-353 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 #e4a1dfa37badd23d3dd2b27e84a7244ee00b7a35 on the integration branch w/8.6/bugfix/BB-353 is merging a branch which is neither the current branch bugfix/BB-353 nor the development branch development/8.6.

It is likely due to a rebase of the branch bugfix/BB-353 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.

Kerkesni commented 1 year ago

/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

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge bugfix/BB-353 into development/8.5
w/8.6/bugfix/BB-353 will be merged into development/8.6

The following branches will NOT be impacted:

development/7.10
development/7.4
development/8.3
development/8.4

You can set option create_pull_requests if you need me to create integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e commented 1 year ago

Waiting for approval

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

the author
2 peers

Kerkesni commented 1 year ago

/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.6/bugfix/BB-353 with contents from bugfix/BB-353 and development/8.6.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.6/bugfix/BB-353 origin/development/8.6
 $ git merge origin/bugfix/BB-353
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.6/bugfix/BB-353

bert-e commented 1 year ago

Waiting for approval

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

the author
2 peers

Kerkesni commented 1 year ago

/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:

:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6

The following branches will NOT be impacted:

development/7.10
development/7.4
development/8.3
development/8.4

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.

Any commit you add on the source branch will trigger a new cycle after the current queue is merged.
Any commit you add on one of the integration branches will be lost.

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:

:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6

The following branches have NOT changed:

development/7.10
development/7.4
development/8.3
development/8.4

Please check the status of the associated issue BB-353.

Goodbye kerkesni.