Skip to content

Conversation

@feeblefakie
Copy link
Contributor

This is an automated request for a manual backport of the following:

  1. Resolve any conflicts that occur during the cherry-picking process.
git fetch origin &&
git checkout 3-pull-3001 &&
git cherry-pick --no-rerere-autoupdate -m1 367eb2e4689ef89706f8456300105c50d9ae64dc
  1. Push the changes.
  2. Merge this PR after all checks have passed.

Thank you!

# Conflicts:
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/SingleCrudOperationTransactionAdminIntegrationTestWithJdbcDatabase.java
#	core/src/integration-test/java/com/scalar/db/transaction/jdbc/JdbcTransactionAdminIntegrationTest.java
@Torch3333 Torch3333 marked this pull request as ready for review October 29, 2025 07:26
@Torch3333 Torch3333 merged commit f2c8b23 into 3 Oct 29, 2025
127 of 128 checks passed
@Torch3333 Torch3333 deleted the 3-pull-3001 branch October 29, 2025 07:26
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.

2 participants