Upmerge test changes

[jpmcmu]

Type of change:

• This change is a bug fix (non-breaking change which fixes an issue).
• This change is a new feature (non-breaking change which adds functionality).
• This change is a breaking change (fix or feature that will cause existing behavior to change).

Custom Platform Testing (Optional)

Custom HPCC-Platform Repository:
repository:

Custom HPCC-Platform Branch:
branch:

Checklist:

• I have created a corresponding JIRA ticket for this submission
• My code follows the code style of this project.
  • I have applied the Eclipse code-format template provided.
• My change requires a change to the documentation.
  • I have updated the documentation accordingly, or...
  • I have created a JIRA ticket to update the documentation.
  • Any new interfaces or exported functions are appropriately commented.
• I have read the HPCC Systems CONTRIBUTORS document (https://github.com/hpcc-systems/HPCC-Platform/wiki/Guide-for-contributors).
• The change has been fully tested:
  • This change does not cause any existing JUnits to fail.
  • I have include JUnit coverage to test this change
  • I have performed system test and covered possible regressions and side effects.
• I have given due consideration to all of the following potential concerns:
  • Scalability
  • Performance
  • Security
  • Thread-safety
  • Premature optimization
  • This change fixes the problem, not just the symptom

Testing:

[github-actions]

🔄 Upmerge Test Results

Status: ❌ Conflicts detected
PR: #52 - Upmerge test changes
Base Branch: candidate-9.12.x
Test Time: 2026-01-26 19:39:11 UTC

How To Resolve❗: Create a PR against conflicting branches and resolve the conflict manually, after the conflicts have been resolved rerun the Upmerge test.

❌ Conflicting Branches (3)

• candidate-9.14.x
• candidate-10.0.x
• master
  This comment was automatically generated by the upmerge test workflow.

[github-actions]

🔄 Upmerge Test Results

Status: ❌ Conflicts detected
PR: #52 - Upmerge test changes
Base Branch: candidate-9.12.x
Test Time: 2026-01-26 19:48:07 UTC

How To Resolve❗: Create a PR against conflicting branches and resolve the conflict manually, after the conflicts have been resolved rerun the Upmerge test.

❌ Conflicting Branches (3)

• candidate-9.14.x
• candidate-10.0.x
• master
  This comment was automatically generated by the upmerge test workflow.

[github-actions]

🔄 Upmerge Test Results

Status: ✅ All branches merged successfully
PR: #52 - Upmerge test changes
Base Branch: candidate-9.12.x
Test Time: 2026-01-26 19:50:17 UTC

✅ Successful Branches (4)

• candidate-9.12.x
• candidate-9.14.x
• candidate-10.0.x
• master
  This comment was automatically generated by the upmerge test workflow.

[github-actions]

🔄 Auto-Upmerge Results

Status: ⚠️ Some upmerges failed

❌ Failed Upmerges (2)

• candidate-9.12.x
• master

Action Required: These branches need manual upmerging due to conflicts.

This comment was automatically generated by the auto-upmerge workflow.

[github-actions]

🔄 Auto-Upmerge Results

Status: ⚠️ Some upmerges failed

❌ Failed Upmerges (4)

• candidate-9.12.x
• candidate-9.14.x
• candidate-10.0.x
• master

Action Required: These branches need manual upmerging due to conflicts.

This comment was automatically generated by the auto-upmerge workflow.