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/579800e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/579800e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/579800e4 Branch: refs/heads/master Commit: 579800e4e636fb4c784a1ed51374617a694e8141 Parents: 671e9a5 3d95be9 Author: stevenschew <[email protected]> Authored: Mon Feb 6 16:15:22 2017 +0800 Committer: stevenschew <[email protected]> Committed: Mon Feb 6 16:15:22 2017 +0800 ---------------------------------------------------------------------- NOTICE | 2 +- README.md | 17 +++++++------ .../apache/rocketmq/broker/BrokerStartup.java | 2 +- .../java/org/apache/rocketmq/common/MixAll.java | 3 ++- .../remoting/netty/NettyRemotingClient.java | 26 +++++++------------- test/pom.xml | 4 +-- 6 files changed, 24 insertions(+), 30 deletions(-) ----------------------------------------------------------------------
