This is an automated email from the ASF dual-hosted git repository. yukon pushed a commit to branch enhancedTls in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit ba9ded4bbe008ac2e01c9eb36116d9f06917ef99 Merge: dd2339b 69043c0 Author: yukon <[email protected]> AuthorDate: Mon Dec 18 14:50:36 2017 +0800 Merge branch 'develop' into enhancedTls # Conflicts: # remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java # remoting/src/test/java/org/apache/rocketmq/remoting/TlsTest.java .../PULL_REQUEST_TEMPLATE.md | 0 broker/pom.xml | 2 +- .../rocketmq/broker/latency/BrokerFastFailure.java | 27 ++++++-- .../broker/latency/BrokerFastFailureTest.java | 65 ++++++++++++++++++ client/pom.xml | 2 +- .../impl/consumer/DefaultMQPushConsumerImpl.java | 11 +++- .../client/impl/consumer/ProcessQueue.java | 31 +++++---- .../client/impl/factory/MQClientInstance.java | 2 - .../impl/producer/DefaultMQProducerImpl.java | 6 +- .../consumer/DefaultMQPushConsumerImplTest.java | 61 +++++++++++++++++ common/pom.xml | 2 +- .../org/apache/rocketmq/common/BrokerConfig.java | 18 +++++ distribution/pom.xml | 2 +- example/pom.xml | 4 +- filter/pom.xml | 2 +- filtersrv/pom.xml | 2 +- logappender/pom.xml | 2 +- namesrv/pom.xml | 2 +- .../apache/rocketmq/namesrv/NamesrvStartup.java | 10 --- openmessaging/pom.xml | 2 +- pom.xml | 11 ++-- remoting/pom.xml | 2 +- srvutil/pom.xml | 2 +- store/pom.xml | 2 +- .../apache/rocketmq/store/DefaultMessageStore.java | 5 +- .../java/org/apache/rocketmq/store/MappedFile.java | 5 ++ .../org/apache/rocketmq/store/MappedFileQueue.java | 7 +- .../store/DefaultMessageStoreShuwDownTest.java | 76 ++++++++++++++++++++++ .../apache/rocketmq/store/MappedFileQueueTest.java | 53 ++++++++++++++- test/pom.xml | 2 +- tools/pom.xml | 2 +- 31 files changed, 356 insertions(+), 64 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
