ARSN-620 Fix lifecycle listings stuck on PHD master keys - #2712
Conversation
Hello nicolas2bert,My role is to assist you with the merge of this Available options
Available commands
Status report is not available. |
|
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 |
|
/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/8.5/bugfix/ARSN-620/lc-phd-9.5 origin/development/8.5
git merge origin/bugfix/ARSN-620/lc-phd-9.5
# <intense conflict resolution>
git commit
git push -u origin w/8.5/bugfix/ARSN-620/lc-phd-9.5The following options are set: 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 |
(cherry picked from commit c14bc52)
b366947 to
7d29c31
Compare
History mismatchMerge commit #9451cd989672c90bf3c2b54c177811f07238eef8 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 |
History mismatchMerge commit #9451cd989672c90bf3c2b54c177811f07238eef8 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 |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## development/8.4 #2712 +/- ##
===================================================
+ Coverage 74.42% 74.44% +0.02%
===================================================
Files 229 229
Lines 18548 18566 +18
Branches 3810 3811 +1
===================================================
+ Hits 13804 13822 +18
Misses 4739 4739
Partials 5 5 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
@bert-e 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/8.5/bugfix/ARSN-620/lc-phd-9.5 origin/development/8.5
git merge origin/bugfix/ARSN-620/lc-phd-9.5
# <intense conflict resolution>
git commit
git push -u origin w/8.5/bugfix/ARSN-620/lc-phd-9.5The following options are set: create_integration_branches |
|
ping |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
The following options are set: create_integration_branches |
|
@bert-e 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:
This pull request does not target the following hotfix branch(es) so they
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, 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 ARSN-620. Goodbye nicolas2bert. |
Cherry-pick for Cloudserver
development /9.3used in Federationdevelopment/9.5