[ROCKETMQ-54] resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/a06a5176 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/a06a5176 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/a06a5176 Branch: refs/heads/ROCKETMQ-54 Commit: a06a517635d9c41711644caa8eed7ac46760ea5f Parents: 3884370 4291348 Author: stevenschew <[email protected]> Authored: Thu Jan 19 20:45:32 2017 +0800 Committer: stevenschew <[email protected]> Committed: Thu Jan 19 20:45:32 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 45 +++- README.md | 2 +- .../rocketmq/broker/BrokerTestHarness.java | 69 ------ .../broker/api/BrokerFastFailureTest.java | 61 ----- .../rocketmq/broker/api/SendMessageTest.java | 79 ------ .../offset/ConsumerOffsetManagerTest.java | 61 ----- .../broker/topic/TopicConfigManagerTest.java | 60 ----- .../consumer/DefaultMQPullConsumerTest.java | 152 ++++++++++++ .../consumer/DefaultMQPushConsumerTest.java | 178 +++++++++++++ .../store/LocalFileOffsetStoreTest.java | 3 +- .../impl/factory/MQClientInstanceTest.java | 6 +- .../client/producer/DefaultMQProducerTest.java | 248 +++++++++++++++++++ pom.xml | 76 +++++- 13 files changed, 696 insertions(+), 344 deletions(-) ----------------------------------------------------------------------
