CLDSRV-635: Bump arsenal for kmip logs (backport)#5781
CLDSRV-635: Bump arsenal for kmip logs (backport)#5781bert-e merged 1 commit intodevelopment/7.10from
Conversation
Hello bourgoismickael,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 |
jonathan-gramain
left a comment
There was a problem hiding this comment.
Is this a temporary branch for testing until we bump arsenal 7.10.x? Otherwise I would expect a real version bump, not a reference to a branch
Yes I'm merging arsenal and bumping arsenal then I update this commit to point to the new arsenal version |
0522620 to
ca0d3fe
Compare
|
/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-635-kmip-logs origin/development/7.70
$ git merge origin/improvement/CLDSRV-635-kmip-logs
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/improvement/CLDSRV-635-kmip-logsThe following options are set: create_integration_branches |
|
/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, create_integration_branches |
Build failedThe build for commit did not succeed in branch w/9.1/improvement/CLDSRV-635-kmip-logs The following options are set: approve, create_integration_branches |
|
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-635. Goodbye bourgoismickael. The following options are set: approve, create_integration_branches |
Arsenal changes: scality/Arsenal@7.10.62...improvement/ARSN-483-kmip-logsArsenal changes: scality/Arsenal@7.10.62...7.10.66