Closed nicolas2bert closed 1 year 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-462 contains:
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.14
7.70.8
8.5.5
8.6.29
8.7.0
Please check the Fix Version/s
of BB-462, or the target
branch of this pull request.
ping
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-462/lifecycle
with contents from bugfix/BB-462/lifecycle
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-462/lifecycle origin/development/7.70
$ git merge origin/bugfix/BB-462/lifecycle
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/BB-462/lifecycle
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-462/lifecycle
with contents from w/7.70/bugfix/BB-462/lifecycle
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-462/lifecycle origin/development/8.5
$ git merge origin/w/7.70/bugfix/BB-462/lifecycle
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.5/bugfix/BB-462/lifecycle
The following options are set: create_integration_branches
Merge commit #d8ab9f8d1c9631ca08b58de056ac4e31faa5e940 on the integration branch
w/7.70/bugfix/BB-462/lifecycle
is merging a branch which is neither the current
branch bugfix/BB-462/lifecycle
nor the development branch
development/7.70
.
It is likely due to a rebase of the branch bugfix/BB-462/lifecycle
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: create_integration_branches
@bert-e reset
I have successfully deleted this pull request's integration branches.
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/bugfix/BB-462/lifecycle
with contents from bugfix/BB-462/lifecycle
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-462/lifecycle origin/development/7.70
$ git merge origin/bugfix/BB-462/lifecycle
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/BB-462/lifecycle
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/8.5/bugfix/BB-462/lifecycle
with contents from w/7.70/bugfix/BB-462/lifecycle
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-462/lifecycle origin/development/8.5
$ git merge origin/w/7.70/bugfix/BB-462/lifecycle
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.5/bugfix/BB-462/lifecycle
The following options are set: create_integration_branches
I have created the integration data for the additional destination branches.
bugfix/BB-462/lifecycle
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-462.
Goodbye nicolas2bert.
Note1: The change won't be forward-ported into Artesca branches. Note2: Only buckets with versioning enabled can be configured for replication.
To expire non-versioned objects correctly, we currently rely on the InvalidBucketState error returned when the S3C Backbeat API is used for a non-versioned bucket's object, until CLDSRV-461 is implemented to add support for non-versioned buckets to the Backbeat API.