Fix conflict,merge develop #2906
Merged
Conversation
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
[ISSUE apache#2730]fix Multiple instances in the same application share MQClientInstance
…ture to 4.6.0. Co-authored-by: von gosling <[email protected]>
[ISSUE apache#2801]Fix NamesrvAddr connot set in Producer
Co-authored-by: ph3636 <[email protected]>
…tp (apache#2804) * fix the endpoint cannot get instanceId without http * fix the endpoint cannot get instanceId without http * add unit test * add unit test * add unit test Co-authored-by: panzhi33 <[email protected]>
…ener_npe [ISSUE apache#2816] fix messageArrivingListener NPE
…ssageStoreTest test program
…topic [ISSUE apache#2811] Fix the wrong topic was consumed in the DefaultMessageStoreTest test program
[ISSUE apache#2538]Optimize log output when message trace saving fails
…PullConsumer (apache#2832) * [ISSUE apache#2732] Fix message loss problem when rebalance with LitePullConsumer * Fix message loss problem when rebalance with LitePullConsumer, update 2
[ISSUE apache#2846]fix -E might not port to other systems
fix some nonconformity after checkstyle
[ISSUE apache#2872] remove log files created by integration test when mvn clean
[ISSUE apache#2872] move log files created by integration test to target dir
[ISSUE apache#2883] [Part A] Improve produce performance in M/S mode.
Bump mockito-core to 3.10.0, remove powermock dependency, suppress useless logging
…eckstyle execution (apache#2899)
Fix unit test stability
# Conflicts: # client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java # client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java # client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java # pom.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Make sure set the target branch to
developWhat is the purpose of the change
XXXXX
Brief changelog
XX
Verifying this change
XXXX
Follow this checklist to help us incorporate your contribution quickly and easily. Notice,
it would be helpful if you could finish the following 5 checklist(the last one is not necessary)before request the community to review your PR.[ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.mvn -B clean apache-rat:check findbugs:findbugs checkstyle:checkstyleto make sure basic checks pass. Runmvn clean install -DskipITsto make sure unit-test pass. Runmvn clean test-compile failsafe:integration-testto make sure integration-test pass.