You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by lo...@apache.org on 2016/12/23 09:32:39 UTC

[4/6] incubator-rocketmq git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-rocketmq

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-rocketmq


Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/c92332e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/c92332e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/c92332e1

Branch: refs/heads/master
Commit: c92332e18e408a039b3489f45c390a6aeaf10bb2
Parents: 0014a4c 4b446d7
Author: lollipop <lo...@apache.org>
Authored: Fri Dec 23 16:27:56 2016 +0800
Committer: lollipop <lo...@apache.org>
Committed: Fri Dec 23 16:27:56 2016 +0800

----------------------------------------------------------------------
 pom.xml                                         |  8 +-
 .../rocketmq/broker/BrokerControllerTest.java   | 53 +++++++++++++
 .../alibaba/rocketmq/client/ValidatorsTest.java | 18 ++---
 rocketmq-store/pom.xml                          | 18 ++++-
 .../alibaba/rocketmq/store/ha/HAService.java    | 28 ++++---
 .../rocketmq/store/DefaultMessageStoreTest.java | 78 +++++++++++--------
 .../rocketmq/store/MappedFileQueueTest.java     | 59 ++++++--------
 .../alibaba/rocketmq/store/MappedFileTest.java  | 82 ++++++++++----------
 .../com/alibaba/rocketmq/store/RecoverTest.java |  3 +-
 .../rocketmq/store/StoreCheckpointTest.java     | 35 ++++-----
 .../rocketmq/store/index/IndexFileTest.java     | 61 ++++++---------
 .../src/test/resources/logback-test.xml         | 34 ++++++++
 12 files changed, 277 insertions(+), 200 deletions(-)
----------------------------------------------------------------------