You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@rocketmq.apache.org by hu...@apache.org on 2021/08/23 04:46:25 UTC

[rocketmq] 01/01: Merge branch 'develop_include_prs_after_4.9.1_version', remote-tracking branch 'origin' into develop

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

huzongtang pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git

commit 9e66da4bbcd07dc5abf66f2e970d357217f0500d
Merge: 2820e47 fb8bc64 44bdeed
Author: zongtanghu <zo...@gmail.com>
AuthorDate: Mon Aug 23 12:45:57 2021 +0800

    Merge branch 'develop_include_prs_after_4.9.1_version', remote-tracking branch 'origin' into develop

 .github/workflows/greetings.yml                    | 29 ++++++++++++++
 .../acl/plain/RemoteAddressStrategyFactory.java    |  2 +-
 .../java/org/apache/rocketmq/common/UtilAll.java   |  4 +-
 .../apache/rocketmq/common/message/Message.java    | 11 ++++--
 .../rocketmq/common/protocol/NamespaceUtil.java    |  2 +-
 .../org/apache/rocketmq/common/UtilAllTest.java    | 13 ++++++
 .../rocketmq/common/utils/IOTinyUtilsTest.java     |  4 +-
 docs/cn/RocketMQ_Example.md                        |  6 ++-
 .../rocketmq/example/benchmark/Consumer.java       | 30 ++++++++------
 .../rocketmq/example/benchmark/Producer.java       | 44 ++++++++++++---------
 .../example/benchmark/TransactionProducer.java     | 46 ++++++++++++----------
 .../filter/expression/UnaryExpression.java         | 16 +++++++-
 .../rocketmq/filter/parser/ParseException.java     |  7 ++--
 .../rocketmq/filter/parser/TokenMgrError.java      |  3 +-
 .../org/apache/rocketmq/filter/ParserTest.java     |  2 +-
 .../rocketmq/remoting/common/RemotingHelper.java   |  2 +-
 .../rocketmq/store/stats/BrokerStatsManager.java   |  4 +-
 .../message/QueryMsgByUniqueKeySubCommand.java     |  5 ++-
 18 files changed, 155 insertions(+), 75 deletions(-)