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 1bedba8cbcef32554d2dc80f2a340ea686d68ba9 Merge: d434a3a 0f153b9 Author: duhengforever <[email protected]> AuthorDate: Tue Nov 13 21:09:32 2018 +0800 Merge branch 'develop' .../broker/plugin/AbstractPluginMessageStore.java | 6 ++ .../broker/processor/AdminBrokerProcessor.java | 12 ++- .../rocketmq/client/consumer/MQPushConsumer.java | 4 + .../client/impl/factory/MQClientInstance.java | 6 +- .../apache/rocketmq/common/CountDownLatch2.java | 2 +- .../rocketmq/common/constant/LoggerName.java | 1 + .../org/apache/rocketmq/common/MixAllTest.java | 2 +- distribution/conf/logback_namesrv.xml | 5 + .../rocketmq/example/simple/AsyncProducer.java | 9 +- .../apache/rocketmq/namesrv/NamesrvStartup.java | 5 +- pom.xml | 20 +--- .../java/org/apache/rocketmq/store/CommitLog.java | 71 +++++++------ .../apache/rocketmq/store/DefaultMessageStore.java | 15 ++- .../org/apache/rocketmq/store/MessageStore.java | 8 ++ .../rocketmq/store/DefaultMessageStoreTest.java | 118 +++++++++++++++++++++ .../tools/admin/DefaultMQAdminExtImpl.java | 2 +- 16 files changed, 225 insertions(+), 61 deletions(-)
