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-452: add version-id to delete notifications #2459

Closed rachedbenmustapha closed 11 months ago

rachedbenmustapha commented 1 year ago

Includes backported logic from 8.x branch, adapted to match available log entries.

bert-e commented 1 year ago

Hello rachedbenmustapha,

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-452 contains:

7.70.7
8.5.5
8.6.29
8.7.0

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

7.70.8
8.5.5
8.6.29
8.7.0

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

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

bert-e commented 1 year ago

Incorrect fix version

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

7.70.8
8.5.5
8.6.29
8.7.0

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

7.70.9
8.5.5
8.6.29
8.7.0

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

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

rachedbenmustapha commented 11 months ago

/create_integration_branches

bert-e commented 11 months ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/feature/BB-452-delete-notification-versionid with contents from feature/BB-452-delete-notification-versionid and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.5/feature/BB-452-delete-notification-versionid origin/development/8.5
 $ git merge origin/feature/BB-452-delete-notification-versionid
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/feature/BB-452-delete-notification-versionid

The following options are set: create_integration_branches

bert-e commented 11 months ago

Integration data created

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

this pull request will merge feature/BB-452-delete-notification-versionid into development/7.70
w/8.5/feature/BB-452-delete-notification-versionid will be merged into development/8.5
w/8.6/feature/BB-452-delete-notification-versionid will be merged into development/8.6
w/8.7/feature/BB-452-delete-notification-versionid will be merged into development/8.7

The following branches will NOT be impacted:

development/7.10
development/7.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

The following options are set: create_integration_branches

bert-e commented 11 months ago

Waiting for approval

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

the author
2 peers

The following options are set: create_integration_branches

rachedbenmustapha commented 11 months ago

/approve

bert-e commented 11 months ago

Build failed

The build for commit did not succeed in branch w/8.6/feature/BB-452-delete-notification-versionid.

The following options are set: approve, create_integration_branches

bert-e commented 11 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:

:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7

The following branches will NOT be impacted:

development/7.10
development/7.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, create_integration_branches

bert-e commented 11 months ago

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

:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.5
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7

The following branches have NOT changed:

development/7.10
development/7.4

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

Goodbye rachedbenmustapha.