Failed: duhenglucky/rocketmq#56 (fix_conflict - e84221d)

[Travis CI <bu...@travis-ci.org>]

Build Update for duhenglucky/rocketmq
-------------------------------------

Build: #56
Status: Failed

Duration: 19 mins and 32 secs
Commit: e84221d (fix_conflict)
Author: ayanamist
Message: Merge remote-tracking branch 'origin/develop' into pop_consumer

# Conflicts:
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/consumer/DefaultMQPushConsumerTest.java
#	client/src/test/java/org/apache/rocketmq/client/trace/DefaultMQConsumerWithTraceTest.java
#	pom.xml

View the changeset: https://github.com/duhenglucky/rocketmq/compare/0597823ff7a9^...e84221d6089c

View the full build log and details: https://travis-ci.org/github/duhenglucky/rocketmq/builds/771630040?utm_medium=notification&utm_source=email


--

You can unsubscribe from build emails from the duhenglucky/rocketmq repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=22557420&utm_medium=notification&utm_source=email.
Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notification&utm_source=email.
Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.