Merge branch 'master' into spec
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/35049678 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/35049678 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/35049678 Branch: refs/heads/spec Commit: 35049678309969d57bcc5c7c116076ee4698bd72 Parents: ccdbdf5 1356e35 Author: vintagewang <[email protected]> Authored: Wed Dec 28 13:39:58 2016 +0800 Committer: vintagewang <[email protected]> Committed: Wed Dec 28 13:39:58 2016 +0800 ---------------------------------------------------------------------- .../broker/processor/PullMessageProcessor.java | 4 +- .../broker/processor/SendMessageProcessor.java | 3 +- .../rocketmq/broker/BrokerControllerTest.java | 10 ++- .../rocketmq/broker/api/SendMessageTest.java | 32 ++++------ .../broker/topic/TopicConfigManagerTest.java | 12 ++-- .../alibaba/rocketmq/common/BrokerConfig.java | 9 +++ .../remoting/netty/NettyRemotingAbstract.java | 67 +++++++++++--------- .../rocketmq/remoting/NettyConnectionTest.java | 52 +++++++++++++++ .../store/AllocateMappedFileService.java | 2 +- .../alibaba/rocketmq/store/MappedFileQueue.java | 22 +++++-- .../alibaba/rocketmq/store/ha/HAService.java | 31 +++++---- .../alibaba/rocketmq/store/index/IndexFile.java | 5 +- .../rocketmq/store/index/IndexService.java | 29 +++++---- .../rocketmq/store/MappedFileQueueTest.java | 17 ++++- .../rocketmq/store/index/IndexFileTest.java | 18 ++++-- .../src/test/resources/logback-test.xml | 3 +- 16 files changed, 212 insertions(+), 104 deletions(-) ----------------------------------------------------------------------
