DanielLeens commented on PR #11838: URL: https://github.com/apache/seatunnel/pull/11838#issuecomment-6287406151
Follow-up: with approval to touch the build files, I also pushed merge commit `de0ca4289e9` (current `dev` into your branch), @RaphaelAdewale, so the PR is no longer conflicting. The five conflicts (`seatunnel-connectors-v2/pom.xml`, `seatunnel-e2e/seatunnel-connector-v2-e2e/pom.xml`, `plugin-mapping.properties`, `config/plugin_config`, `.github/workflows/labeler/label-scope-conf.yml`) were registration lists where `dev` added firebase/websocket/other HTTP connectors next to Splunk; both sides are kept, and against `dev` these files now differ only by the Splunk entries. Verification run of the merged head (includes the 30-minute startup budget change): https://github.com/DanielLeens/seatunnel/actions?query=branch%3Apr11838-verify-de0ca4289e9 -- 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]
