Closed nicolas2bert closed 1 week 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 CLDSRV-565 contains:
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.53
8.6.29
8.7.50
8.8.34
Please check the Fix Version/s
of CLDSRV-565, 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.
@bert-e approve
A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-565/global-sse
with contents from improvement/CLDSRV-565/global-sse
and development/8.6
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
$ git merge origin/improvement/CLDSRV-565/global-sse
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse
The following options are set: approve
I have created the integration data for the additional destination branches.
improvement/CLDSRV-565/global-sse
into
development/7.70
development/8.6
development/8.7
development/8.8
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: approve
The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.
The following options are set: 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.70
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7
:heavy_check_mark: development/8.8
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.
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
@bert-e approve
The corresponding build for the queue failed:
The Fix Version/s
in issue CLDSRV-565 contains:
7.70.53
8.6.29
8.7.50
8.8.34
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.70.54
8.6.29
8.7.50
8.8.34
Please check the Fix Version/s
of CLDSRV-565, or the target
branch of this pull request.
The following options are set: approve
ping
The corresponding build for the queue failed:
@bert-e reset
There seems to be manual commits on integration branches (e.g. conflict resolutions) that will be lost if you chose to reset.
You can use the force_reset
command if you still want me
to delete those branches.
The following options are set: approve
The corresponding build for the queue failed:
@bert-e force_reset
I have successfully deleted this pull request's integration branches.
The following options are set: approve
The corresponding build for the queue failed:
Apparently, new commits were added to the source branch after I had queued this Pull Request. As a result, I have merged only part of it into the targetted development branches:
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.6
:heavy_check_mark: development/8.7
:heavy_check_mark: development/8.8
I will now work on the following commits:
Please avoid this situation next time.
As a friendly reminder, you can use the wait
command to prevent me from processing your
pull-request while your work is still in progress.
There is a conflict between your branch improvement/CLDSRV-565/global-sse
and the
destination branch development/7.70
.
Please resolve the conflict on the feature branch (improvement/CLDSRV-565/global-sse
).
git fetch && \
git checkout origin/improvement/CLDSRV-565/global-sse && \
git merge origin/development/7.70
Resolve merge conflicts and commit
git push origin HEAD:improvement/CLDSRV-565/global-sse
The following options are set: approve
A conflict has been raised during the creation of
integration branch w/8.6/improvement/CLDSRV-565/global-sse
with contents from improvement/CLDSRV-565/global-sse
and development/8.6
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.6/improvement/CLDSRV-565/global-sse origin/development/8.6
$ git merge origin/improvement/CLDSRV-565/global-sse
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.6/improvement/CLDSRV-565/global-sse
The following options are set: approve
I have created the integration data for the additional destination branches.
improvement/CLDSRV-565/global-sse
into
development/7.70
development/8.6
development/8.7
development/8.8
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: approve
The build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse.
The following options are set: approve
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.6
:heavy_check_mark: development/8.7
:heavy_check_mark: development/8.8
The following branches have NOT changed:
development/7.10
development/7.4
Please check the status of the associated issue CLDSRV-565.
Goodbye nicolas2bert.
The following options are set: approve
This PR:
CLDSRV-565 introduces a new configuration variable, globalEncryptionEnabled, which enables global encryption. When set to
true
, all newly created buckets will automatically use the default encryption configuration, AES256.CLDSRV-566 fixes issue where repeatedly calling
S3.putBucketEncryption
could unintentionally remove theisAccountEncryptionEnabled
flag.