search

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-450 bump project version #2456

Closed nicolas2bert closed 1 year ago

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

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.

nicolas2bert commented 1 year ago

/create_integration_branches

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/7.70/improvement/BB-450/bump with contents from improvement/BB-450/bump 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/BB-450/bump origin/development/7.70
 $ git merge origin/improvement/BB-450/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/7.70/improvement/BB-450/bump

The following options are set: create_integration_branches

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/improvement/BB-450/bump with contents from w/7.70/improvement/BB-450/bump 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/improvement/BB-450/bump origin/development/8.5
 $ git merge origin/w/7.70/improvement/BB-450/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/improvement/BB-450/bump

The following options are set: create_integration_branches

nicolas2bert commented 1 year ago

@bert-e approve

bert-e commented 1 year ago

Conflict

A conflict has been raised during the creation of integration branch w/8.5/improvement/BB-450/bump with contents from w/7.70/improvement/BB-450/bump 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/improvement/BB-450/bump origin/development/8.5
 $ git merge origin/w/7.70/improvement/BB-450/bump
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/improvement/BB-450/bump

The following options are set: approve, create_integration_branches

bert-e commented 1 year ago

Integration data created

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

The following branches will NOT be impacted:

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: approve, create_integration_branches

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, create_integration_branches

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 BB-450.

Goodbye nicolas2bert.