Closed nicolas2bert closed 10 months ago
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.
The Fix Version/s
in issue BB-473 contains:
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.16
7.70.11
8.5.5
8.6.31
8.7.0
Please check the Fix Version/s
of BB-473, or the target
branch of this pull request.
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.
/create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-473/probe
with contents from bugfix/BB-473/probe
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/bugfix/BB-473/probe origin/development/7.70
$ git merge origin/bugfix/BB-473/probe
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/BB-473/probe
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-473/probe
with contents from w/7.70/bugfix/BB-473/probe
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/bugfix/BB-473/probe origin/development/8.5
$ git merge origin/w/7.70/bugfix/BB-473/probe
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.5/bugfix/BB-473/probe
The following options are set: create_integration_branches
I have created the integration data for the additional destination branches.
bugfix/BB-473/probe
into
development/7.10
development/7.70
development/8.5
development/8.6
development/8.7
The following branches will NOT be impacted:
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
The following approvals are needed before I can proceed with the merge:
the author
2 peers
The following options are set: create_integration_branches
@bert-e approve
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.10
: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.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.
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
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
: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.4
Please check the status of the associated issue BB-473.
Goodbye nicolas2bert.
Currently, the probe response logic is distributed between Backbeat probe handlers and Arsenal's onRequest method. This scattered approach causes confusion for developers and results in bugs. The solution is to centralize the probe response logic exclusively within the Backbeat probe handlers.