Closed benzekrimaha closed 11 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 ARSN-378 contains:
7.10.42
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.51
7.70.15
8.1.116
Please check the Fix Version/s
of ARSN-378, 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
I have created the integration data for the additional destination branches.
improvement/ARSN-378-BP-authorization
into
development/7.10
development/7.70
development/8.1
The following branches will NOT be impacted:
development/6.4
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 reset
I have successfully deleted this pull request's integration branches.
The following options are set: create_integration_branches
I have created the integration data for the additional destination branches.
improvement/ARSN-378-BP-authorization
into
development/7.10
development/7.70
development/8.1
The following branches will NOT be impacted:
development/6.4
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
A conflict has been raised during the update of
integration branch w/7.70/improvement/ARSN-378-BP-authorization
with contents from improvement/ARSN-378-BP-authorization
and development/7.70
.
Please resolve the conflict on the integration branch (w/7.70/improvement/ARSN-378-BP-authorization
).
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout w/7.70/improvement/ARSN-378-BP-authorization
$ git pull # or "git reset --hard origin/w/7.70/improvement/ARSN-378-BP-authorization"
$ git merge origin/development/7.70
$ # <intense conflict resolution>
$ git commit
$ git merge origin/improvement/ARSN-378-BP-authorization
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/ARSN-378-BP-authorization
The following options are set: create_integration_branches
ping
A conflict has been raised during the update of
integration branch w/8.1/improvement/ARSN-378-BP-authorization
with contents from w/7.70/improvement/ARSN-378-BP-authorization
and development/8.1
.
Please resolve the conflict on the integration branch (w/8.1/improvement/ARSN-378-BP-authorization
).
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout w/8.1/improvement/ARSN-378-BP-authorization
$ git pull # or "git reset --hard origin/w/8.1/improvement/ARSN-378-BP-authorization"
$ git merge origin/development/8.1
$ # <intense conflict resolution>
$ git commit
$ git merge origin/w/7.70/improvement/ARSN-378-BP-authorization
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/ARSN-378-BP-authorization
The following options are set: create_integration_branches
@bert-e create_pull_requests
I have created the integration data for the additional destination branches.
improvement/ARSN-378-BP-authorization
into
development/7.10
development/7.70
(pull request #2194)development/8.1
(pull request #2195)The following branches will NOT be impacted:
development/6.4
development/7.4
Follow integration pull requests if you would like to be notified of build statuses by email.
The following options are set: create_pull_requests, 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_pull_requests, 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.1
The following branches will NOT be impacted:
development/6.4
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_pull_requests, 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.1
The following branches have NOT changed:
development/6.4
development/7.4
Please check the status of the associated issue ARSN-378.
Goodbye benzekrimaha.
This pull request modifies the
actionMapBP
object inlib/policyEvaluator/utils/actionMaps.ts
to include additional properties, extending its functionality.Main change:
lib/policyEvaluator/utils/actionMaps.ts
: Modified theactionMapBP
object to include additional properties, such asbucketDeleteCors
,bucketDeleteLifecycle
, andbucketDeleteReplication
.