[ROCKETMQ-54] Polish for 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/aae7cbe3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/aae7cbe3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/aae7cbe3 Branch: refs/heads/ROCKETMQ-54 Commit: aae7cbe36133ebe3181d6d30a140983a1c273530 Parents: 09439f7 d3a7f24 Author: stevenschew <stevensc...@apache.org> Authored: Sun Jan 22 18:09:42 2017 +0800 Committer: stevenschew <stevensc...@apache.org> Committed: Sun Jan 22 18:09:42 2017 +0800 ---------------------------------------------------------------------- .../rocketmq/namesrv/NameServerInstance.java | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+) ----------------------------------------------------------------------
