DanielLeens commented on PR #12185:
URL: https://github.com/apache/seatunnel/pull/12185#issuecomment-6538591737

   Merged `dev` (`3ac2d1cec6a`) into this branch with a plain merge commit (no 
rebase, no force push). New head: `9c592adb967` (previous head `6446704692`). 
Only formatting was run locally (module-scoped `spotless:apply`); `git diff 
origin/dev --name-status` lists only this PR's own 5 files and no deletions.
   
   Conflicts and resolution:
   - `CheckpointCoordinatorFailoverIT.java`: kept both sides. Imports now carry 
`SubPlan` (this PR) and `ExecutionState` (`dev`); this PR's 
`testBoundedStreamJobCompletesAfterMasterFailover` and `dev`'s 
`latestCompletedCheckpoint` helper both remain, with the shared method closing 
brace restored between them. No line of `dev` was removed.
   
   Compile and tests are left to the fork CI run per the validation policy 
(queued at the time of writing, no result claimed): 
https://github.com/DanielLeens/seatunnel/actions/runs/41165731159
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to