-
Notifications
You must be signed in to change notification settings - Fork 241
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CLDSRV-565 Global default SSE configuration #5684
Conversation
Hello nicolas2bert,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the |
ping |
Request integration branchesWaiting for integration branch creation to be requested by the user. To request integration branches, please comment on this pull request with the following command:
Alternatively, the |
8863867
to
bd6c899
Compare
@bert-e approve |
ConflictA conflict has been raised during the creation of 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 |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option
The following options are set: approve |
Build failedThe build for commit did not succeed in branch w/8.6/improvement/CLDSRV-565/global-sse. The following options are set: approve |
In the queueThe changeset has received all authorizations and has been added to the 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 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 The following options are set: approve |
@bert-e approve |
Queue build failedThe corresponding build for the queue failed:
Remove the pull request from the queue
|
Incorrect fix versionThe
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
Please check the The following options are set: approve |
1dab997
to
0b29e79
Compare
ping |
Queue build failedThe corresponding build for the queue failed:
Remove the pull request from the queue
|
@bert-e reset |
Lossy reset warningThere seems to be manual commits on integration branches (e.g. conflict You can use the The following options are set: approve |
Queue build failedThe corresponding build for the queue failed:
Remove the pull request from the queue
|
@bert-e force_reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: approve |
Queue build failedThe corresponding build for the queue failed:
Remove the pull request from the queue
|
Partial mergeApparently, new commits were added to the source branch after I had queued this
I will now work on the following commits:
Please avoid this situation next time. As a friendly reminder, you can use the |
ConflictThere is a conflict between your branch Please resolve the conflict on the feature branch ( 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 |
ConflictA conflict has been raised during the creation of 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 |
Integration data createdI have created the integration data for the additional destination branches.
The following branches will NOT be impacted:
You can set option
The following options are set: approve |
Build failedThe 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
The following branches have NOT changed:
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.