You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@dubbo.apache.org by vi...@apache.org on 2018/11/14 10:50:16 UTC

[incubator-dubbo] 06/06: Merge branch 'dev-metadata' of github.com:apache/incubator-dubbo into dev-metadata

This is an automated email from the ASF dual-hosted git repository.

victory pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git

commit 21b4334dc9fd61907d2cb26f08c5eb26e05195e4
Merge: 29ef73f bdfc500
Author: cvictory <sh...@gmail.com>
AuthorDate: Wed Nov 14 18:42:00 2018 +0800

    Merge branch 'dev-metadata' of github.com:apache/incubator-dubbo into dev-metadata

 .../cluster/configurator/AbstractConfigurator.java |   7 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java    |   8 +-
 .../org/apache/dubbo/common/utils/UrlUtils.java    |   5 +-
 .../apache/dubbo/config/ConfigCenterConfig.java    |   6 +-
 .../org/apache/dubbo/config/ReferenceConfig.java   |   2 +
 .../org/apache/dubbo/config/ServiceConfig.java     |   2 +
 .../dubbo/config/spring/ConfigCenterBean.java      |  29 +++-
 .../apache/dubbo/config/spring/ReferenceBean.java  |   2 -
 .../apache/dubbo/config/spring/ServiceBean.java    |   2 -
 .../META-INF/spring/dubbo-demo-consumer.xml        |   3 +-
 .../registry/integration/RegistryProtocol.java     | 149 +++++++++++++--------
 .../registry/integration/parser/ConfigParser.java  |  11 +-
 .../parser/model/ConfiguratorConfig.java           |   9 ++
 .../registry/support/ProviderConsumerRegTable.java |  34 +++--
 .../registry/support/ProviderInvokerWrapper.java   |   9 ++
 15 files changed, 194 insertions(+), 84 deletions(-)