rocketmq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From duhengfore...@apache.org
Subject [rocketmq] 01/01: Merge branch 'develop'
Date Fri, 14 Sep 2018 08:58:23 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit a220364b752669c474f9795884faed9bb4e0a8c1
Merge: 0fe5e50 53a6346
Author: duhengforever <duhengforever@gmail.com>
AuthorDate: Fri Sep 14 16:48:55 2018 +0800

    Merge branch 'develop'

 .../apache/rocketmq/broker/BrokerController.java   | 33 +++++++-
 .../rocketmq/broker/latency/BrokerFastFailure.java |  3 +
 .../broker/processor/AdminBrokerProcessor.java     |  4 +
 .../rocketmq/broker/util/ServiceProvider.java      | 32 ++++----
 .../impl/producer/DefaultMQProducerImpl.java       | 92 ++++++++++++++--------
 .../client/impl/producer/MQProducerInner.java      |  7 +-
 .../client/producer/DefaultMQProducer.java         | 17 +++-
 ...Listener.java => LocalTransactionExecuter.java} | 25 ++----
 .../rocketmq/client/producer/MQProducer.java       |  6 +-
 .../TransactionCheckListener.java}                 | 28 ++-----
 .../client/producer/TransactionListener.java       |  2 +-
 .../client/producer/TransactionMQProducer.java     | 86 +++++++++++++++++---
 .../org/apache/rocketmq/common/BrokerConfig.java   | 37 ++++++++-
 .../java/org/apache/rocketmq/common/MQVersion.java |  2 +-
 .../java/org/apache/rocketmq/common/MixAll.java    |  2 +-
 distribution/bin/mqfiltersrv                       | 45 -----------
 distribution/bin/mqfiltersrv.cmd                   | 23 ------
 distribution/bin/mqfiltersrv.xml                   | 45 -----------
 distribution/conf/logback_filtersrv.xml            | 87 --------------------
 .../example/benchmark/TransactionProducer.java     | 83 ++++++++++---------
 .../transaction/TransactionListenerImpl.java       |  2 +
 .../command/message/ConsumeMessageCommand.java     |  2 +-
 22 files changed, 315 insertions(+), 348 deletions(-)


Mime
View raw message