This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 2.7.0-release in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 39583d4de2e0f1398ad1b99e8d31a3c97fb2b8dd Merge: 1eebe74 c679d0b Author: ken.lj <[email protected]> AuthorDate: Wed Jan 9 15:32:23 2019 +0800 resolve merge conflicts .../cluster/router/condition/config/AppRouter.java | 2 +- .../router/condition/config/ListenableRouter.java | 2 +- .../router/condition/config/ServiceRouter.java | 2 +- .../dubbo/rpc/cluster/router/tag/TagRouter.java | 4 +-- .../cluster/router/ConfigConditionRouterTest.java | 8 ++--- .../dubbo/rpc/cluster/router/TagRouterTest.java | 2 +- .../zookeeper/ZookeeperDynamicConfiguration.java | 2 +- .../metadata/identifier/MetadataIdentifier.java | 4 +-- .../identifier/MetadataIdentifierTest.java | 42 ++++++++++++++++++++++ .../zookeeper/ZookeeperMetadataReportTest.java | 15 +++++++- 10 files changed, 69 insertions(+), 14 deletions(-)
