Repository navigation
Improvements/transaction docs large refactorings #399 - Fix for merge error - #406
Merged
Merged
Conversation
Antony Stubbs (astubbs)
force-pushed
the
merge-fix
branch
from
September 2, 2022 12:39
aebac58 to
32ae364
Compare
Antony Stubbs (astubbs)
marked this pull request as ready for review
September 2, 2022 12:44
# Conflicts: # CHANGELOG.adoc # README.adoc # parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/ParallelEoSStreamProcessor.java # parallel-consumer-core/src/main/java/io/confluent/parallelconsumer/internal/PCModule.java # parallel-consumer-core/src/test-integration/java/io/confluent/parallelconsumer/integrationTests/TransactionMarkersTest.java
Antony Stubbs (astubbs)
changed the title
6 tasks done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#399 was merged against the wrong base branch (di-module base instead of master, as the PR was based on the di-module PR)