This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch dev-metadata
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit 92c721b1dc3d0081a5d27c26d5d65567ef32f7c0
Merge: 25080d3 52a325d
Author: ken.lj <ken.lj...@gmail.com>
AuthorDate: Mon Dec 3 19:17:57 2018 +0800
Merge remote-tracking branch 'origin/dev-metadata' into dev-metadata
# Conflicts:
#
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
#
dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
.../apache/dubbo/metadata/definition/MetadataTest.java | 16 ++++++++--------
package-lock.json | 3 +++
2 files changed, 11 insertions(+), 8 deletions(-)
