Merge branch 'ROCKETMQ-206' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/e5d01b41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/e5d01b41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/e5d01b41 Branch: refs/heads/release-4.1.0-incubating Commit: e5d01b4121c3e17be8073752510a7ca78dd2bf76 Parents: 37fbb7b ceeef8e Author: dongeforever <zhendongli...@yeah.net> Authored: Fri May 26 16:34:11 2017 +0800 Committer: dongeforever <zhendongli...@yeah.net> Committed: Fri May 26 16:34:11 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/rocketmq/common/MixAll.java | 26 ++++++++------------ .../org/apache/rocketmq/common/MixAllTest.java | 20 +++++++++++++++ 2 files changed, 30 insertions(+), 16 deletions(-) ----------------------------------------------------------------------