-
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
[edit] CLDSRV-504: update arsenal package #5546
base: development/7.10
Are you sure you want to change the base?
[edit] CLDSRV-504: update arsenal package #5546
Conversation
Hello kaztoozs,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
1735a49
to
c5e5fcf
Compare
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 |
/create_integration_branches |
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: create_integration_branches |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
a66f293
to
b652cc9
Compare
History mismatchMerge commit #a66f293217fdcac716ef54c0e419a837250db05c on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_integration_branches |
b652cc9
to
250e902
Compare
History mismatchMerge commit #c5e5fcf99b7cd4201e674053aaf2fe166de7a5da on the integration branch It is likely due to a rebase of the branch Please use the The following options are set: create_integration_branches |
/reset |
Reset completeI have successfully deleted this pull request's integration branches. The following options are set: create_integration_branches |
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/7.70/improvement/CLDSRV-504-arsenal-ssl-check origin/development/7.70
$ git merge origin/improvement/CLDSRV-504-arsenal-ssl-check
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-504-arsenal-ssl-check The following options are set: create_integration_branches |
Pull request template
Description
Motivation and context
This update of Cloudserver is required for implementing the new arsenal version with SSL secureTransport condition testing
Related issues
https://scality.atlassian.net/jira/software/c/projects/OS/boards/214?assignee=61360619c425a20068e9dfcb&selectedIssue=S3C-8124
Green Federation build with this iamge
https://github.com/scality/Federation/pull/5484