Skip to content

Conversation

@dimas-b
Copy link
Contributor

@dimas-b dimas-b commented Sep 2, 2025

Fix undetected merge conflict after #2197 + #2415 + #2434

  • Use local diagnostics in TransactionWorkspaceMetaStoreManager
  • Add resetCredentials to PolarisPrincipalsEventServiceDelegator

@github-project-automation github-project-automation bot moved this to PRs In Progress in Basic Kanban Board Sep 2, 2025
@dimas-b dimas-b enabled auto-merge (squash) September 2, 2025 19:09
@dimas-b dimas-b disabled auto-merge September 2, 2025 19:17
@dimas-b dimas-b enabled auto-merge (squash) September 2, 2025 19:17
HonahX
HonahX previously approved these changes Sep 2, 2025
@github-project-automation github-project-automation bot moved this from PRs In Progress to Ready to merge in Basic Kanban Board Sep 2, 2025
flyrain
flyrain previously approved these changes Sep 2, 2025
@dimas-b dimas-b dismissed stale reviews from flyrain and HonahX via 62fd0e9 September 2, 2025 20:54
@dimas-b dimas-b changed the title Use local diagnostics in TransactionWorkspaceMetaStoreManager Fix CI Sep 2, 2025
@dimas-b dimas-b requested review from HonahX and flyrain September 2, 2025 20:55
@dimas-b dimas-b disabled auto-merge September 2, 2025 20:55
@dimas-b dimas-b enabled auto-merge (squash) September 2, 2025 20:55
@dimas-b dimas-b merged commit f41d5bf into apache:main Sep 2, 2025
12 checks passed
@github-project-automation github-project-automation bot moved this from Ready to merge to Done in Basic Kanban Board Sep 2, 2025
@dimas-b dimas-b deleted the fix-compile branch September 2, 2025 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants