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-2598 &&
git cherry-pick --no-rerere-autoupdate -m1 f14554cd7906d11cd6ab1d63e79c111ea3ccd288
  1. Push the changes.
  2. Merge this PR after all checks have passed.

Thank you!

Torch3333 and others added 2 commits May 8, 2025 17:45
# Conflicts:
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminTestUtils.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
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcConfig.java
#	core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminRepairTableIntegrationTestBase.java
@brfrn169 brfrn169 marked this pull request as ready for review May 8, 2025 13:47
@brfrn169 brfrn169 merged commit 1ea90ab into 3 May 8, 2025
55 checks passed
@brfrn169 brfrn169 deleted the 3-pull-2598 branch May 8, 2025 13:47
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.

3 participants