mirror of
https://github.com/apache/rocketmq.git
synced 2026-09-24 16:04:00 +08:00
Merge remote-tracking branch 'origin/master' into develop
# Conflicts: # broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java # common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java # common/src/main/java/org/apache/rocketmq/common/MixAll.java # common/src/main/java/org/apache/rocketmq/common/message/Message.java # common/src/main/java/org/apache/rocketmq/common/protocol/route/BrokerData.java # pom.xml # remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java # store/src/main/java/org/apache/rocketmq/store/CommitLog.java # test/src/main/java/org/apache/rocketmq/test/listener/AbstractListener.java # test/src/test/java/org/apache/rocketmq/test/client/consumer/filter/SqlFilterIT.java
This commit is contained in:
@@ -20,6 +20,9 @@ package org.apache.rocketmq.test.client.consumer.filter;
|
||||
import org.apache.log4j.Logger;
|
||||
import org.apache.rocketmq.client.consumer.MessageSelector;
|
||||
import org.apache.rocketmq.test.base.BaseConf;
|
||||
import org.apache.rocketmq.test.client.consumer.broadcast.BaseBroadCastIT;
|
||||
import org.apache.rocketmq.test.client.consumer.broadcast.normal.NormalMsgTwoSameGroupConsumerIT;
|
||||
import org.apache.rocketmq.test.client.rmq.RMQBroadCastConsumer;
|
||||
import org.apache.rocketmq.test.client.rmq.RMQNormalProducer;
|
||||
import org.apache.rocketmq.test.client.rmq.RMQSqlConsumer;
|
||||
import org.apache.rocketmq.test.factory.ConsumerFactory;
|
||||
|
||||
Reference in New Issue
Block a user