CLDSRV-648: KMIP retries on cluster#5803
Conversation
Hello bourgoismickael,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
4f1b80f to
b48aa48
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 |
Because the request was already sent to 1 host at first. |
b48aa48 to
0dfba9e
Compare
|
/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.8/improvement/CLDSRV-648-kmipretry origin/development/8.8
$ git merge origin/improvement/CLDSRV-648-kmipretry
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.8/improvement/CLDSRV-648-kmipretryThe 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/9.0/improvement/CLDSRV-648-kmipretry origin/development/9.0
$ git merge origin/w/8.8/improvement/CLDSRV-648-kmipretry
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/9.0/improvement/CLDSRV-648-kmipretryThe 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 |
|
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-648. Goodbye bourgoismickael. The following options are set: approve |
No description provided.