Closed aneeshkp closed 5 months ago
@aneeshkp: This pull request references Jira Issue OCPBUGS-35105, 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.
/cherry-pick release-4.16
@aneeshkp: once the present PR merges, I will cherry-pick it on top of release-4.16 in a new PR and assign it to you.
/hold
/unhold
/jira refresh
@aneeshkp: This pull request references Jira Issue OCPBUGS-35105, which is valid. The bug has been moved to the POST state.
Requesting review from QA contact: /cc @yliu127
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: aneeshkp, josephdrichard, nishant-parekh
The full list of commands accepted by this bot can be found here.
The pull request process is described here
@aneeshkp: Jira Issue OCPBUGS-35105: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-35105 has been moved to the MODIFIED state.
@aneeshkp: #1926 failed to apply on top of branch "release-4.16":
Applying: ztp: update ptpconfig to configure NAV-TIMELS
Using index info to reconstruct a base tree...
M ztp/source-crs/PtpConfigDualCardGmWpc.yaml
M ztp/source-crs/PtpConfigGmWpc.yaml
Falling back to patching base and 3-way merge...
Auto-merging ztp/source-crs/PtpConfigGmWpc.yaml
CONFLICT (content): Merge conflict in ztp/source-crs/PtpConfigGmWpc.yaml
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: update ptpconfig to configure NAV-TIMELS
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".
/cherry-pick release-4.16
@aneeshkp: new pull request created: #1932
This PR Updates ptpconfig to configure the hardware plugin to periodically send the u-blox command NAV-TIMELS via the UBX-CFG-MSG message. NAV-TIMELS carries information about leap dates and offsets. Required for T-WPC leap events cc @vitus133