Closed openshift-cherrypick-robot closed 2 months ago
@openshift-cherrypick-robot: Jira Issue OCPBUGS-34786 has been cloned as Jira Issue OCPBUGS-35272. Will retitle bug to link to clone. /retitle [release-4.15] OCPBUGS-35272: Add TIMELS indication on T-GMs
@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-35272, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
/jira refresh
@aneeshkp: This pull request references Jira Issue OCPBUGS-35272, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
/jira refresh
@aneeshkp: This pull request references Jira Issue OCPBUGS-35272, which is valid. The bug has been moved to the POST state.
No GitHub users were found matching the public email listed for the QA contact in Jira (bblock@redhat.com), skipping review request.
/approved
/approve
/lgtm
/approve
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: aneeshkp, jzding, openshift-cherrypick-robot, sabbir-47
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@openshift-cherrypick-robot: Jira Issue OCPBUGS-35272: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-35272 has been moved to the MODIFIED state.
/cherry-pick release-4.14
@aneeshkp: #1931 failed to apply on top of branch "release-4.14":
Applying: ztp: add TIMELS indication on T-GMs
Using index info to reconstruct a base tree...
M ztp/source-crs/PtpConfigDualCardGmWpc.yaml
Falling back to patching base and 3-way merge...
Auto-merging ztp/source-crs/PtpConfigDualCardGmWpc.yaml
CONFLICT (content): Merge conflict in ztp/source-crs/PtpConfigDualCardGmWpc.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ztp: add TIMELS indication on T-GMs
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
This is an automated cherry-pick of #1929
/assign aneeshkp