[rocketmq] branch pop_consumer updated (ac9aaa4 -> 55eee4b)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

duhengforever pushed a change to branch pop_consumer
in repository https://gitbox.apache.org/repos/asf/rocketmq.git.


    from ac9aaa4  Fix conflict,merge develop (#2906)
     add e9b2d85  [ISSUE #1233] Fix CVE-2011-1473
     add 44736c3  fix Multiple instances in the same application share MQClientInstance
     add 735ecaa  Merge pull request #2731 from panzhi33/develop
     add 4645942  [ISSUE #2748] Fix deleteSubscriptionGroup not remove consumer offset
     add 7680063  [ISSUE #2745] Changed the support time of the request/reply feature to 4.6.0.
     add af8a964  [ISSUE #2729] Replace with Math.min method call
     add 0ff882b  [ISSUE #2801]Fix NamesrvAddr connot set in Producer
     add 0f860e5  Merge pull request #2802 from zhangjidi2016/develop
     add 4117d00  [ISSUE 2800] optimize: the spelling of topicSynFlag
     add 1fbccd1  [ISSUE #2803] Fix the endpoint cannot get instanceId without http (#2804)
     add ee5ecc1  fix messageArrivingListener NPE
     add ba74c49  Merge pull request #2815 from BurningCN/fix_messageArrivingListener_npe
     add 0b6bd18  [ISSUE #2811] Fix the wrong topic was consumed in the DefaultMessageStoreTest test program
     add 8eb0472  Merge pull request #2824 from BurningCN/fix_test_consume_wrong_topic
     add 0720f0e  [ISSUE #2538]Optimize log output when message trace saving fails
     add 7ee2cd3  Merge pull request #2822 from zhangjidi2016/develop
     add b4cee1b  [ISSUE #2821] Overriding the ServiceThread#shutdown in HAClient class
     add bc4ecb3  [ISSUE #2805] remove redundant package imports
     add c3d4641  [ISSUE #2833] Support trace for TranscationProducer (#2834)
     add f77d7fe  [ISSUE #2732] Fix message loss problem when rebalance with LitePullConsumer (#2832)
     add 337791a  [ISSUE #2846]fix -E might not port to other systems
     add 061c51f  Merge pull request #2848 from panzhi33/develop
     add e14f66e  fix some nonconformity after checkstyle
     add fb0d019  Merge pull request #2851 from drgnchan/develop
     add f2a5a74  Support OpenTracing(#2861)
     add 51439cc  [ISSUE #2872] remove log files created by integration test when mvn clean
     add b6379cd  Merge pull request #2874 from ayanamist/clean-test-files
     add 5a06651  [ISSUE #2872] move log files created by integration test to target dir
     add fe78d18  Merge pull request #2877 from ayanamist/clean-test-files
     add 541c35d  Change log level to debug: "Half offset {} has been committed/rolled back"
     add be6eaf8  Merge pull request #2884 from areyouok/dev_speed_A
     add d26f507  [ISSUE #2898] Resolve rocketmq-example project failed during checkstyle execution (#2899)
     add 1350c3f  Fix unit test stability
     add 5d21257  Merge pull request #2903 from ayanamist/fix-test
     add f5cf3cc  Fix ORIGIN_MESSAGE_ID field not write into commitlog (#2869)
     add 6c279f3  docs(fix typo)
     add 8a2554d  [ISSUE #2826] Remove useless code (#2827)
     add 55eee4b  Merge branch 'develop' into pop_consumer

No new revisions were added by this update.

Summary of changes:
 .../broker/processor/SendMessageProcessor.java       |  2 ++
 .../client/consumer/DefaultLitePullConsumerTest.java |  4 ----
 .../client/consumer/DefaultMQPushConsumerTest.java   | 12 ++++--------
 .../apache/rocketmq/common/constant/PermName.java    |  4 ++--
 docs/cn/design.md                                    |  2 +-
 docs/en/Design_LoadBlancing.md                       | 20 +++++++++++---------
 6 files changed, 20 insertions(+), 24 deletions(-)