This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a change to branch develop-merge-5.0.0
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
from 3fadc8f30 Merge branch '5.0.0-beta' into develop
add 9a9f44566 Fix examine consume stats for none static topic (#4571)
new a7d9021c3 Merge remote-tracking branch 'apache/5.0.0-beta' into
develop-merge-5.0.0
new 833e9e0e0 Polish conf/container directory
new 2cb8473f2 Make travis ci can pass when function interface changed
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 2 +-
.../2container-2m-2s/broker-a-in-container1.conf | 3 +-
.../2container-2m-2s/broker-a-in-container2.conf | 3 +-
.../2container-2m-2s/broker-b-in-container1.conf | 3 +-
.../2container-2m-2s/broker-b-in-container2.conf | 3 +-
distribution/conf/container/broker-a.conf | 34 ----------------------
distribution/conf/container/broker-b.conf | 34 ----------------------
distribution/conf/container/broker-container.conf | 24 ---------------
docs/cn/BrokerContainer.md | 2 +-
.../test/smoke/NormalMessageSendAndRecvIT.java | 33 +++++++++++++++++----
.../rocketmq/test/statictopic/StaticTopicIT.java | 2 ++
.../tools/admin/DefaultMQAdminExtImpl.java | 9 ++++++
.../rocketmq/tools/command/MQAdminStartup.java | 14 ++++++---
13 files changed, 55 insertions(+), 111 deletions(-)
delete mode 100644 distribution/conf/container/broker-a.conf
delete mode 100644 distribution/conf/container/broker-b.conf
delete mode 100644 distribution/conf/container/broker-container.conf
