nkorange cd18124908 Merge branch 'feature_validate_service_format' into feature_naming_ap ... # Conflicts: # naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java # naming/src/main/java/com/alibaba/nacos/naming/core/Instance.java # naming/src/main/java/com/alibaba/nacos/naming/core/Service.java # naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java		2019-02-14 19:24:48 +08:00
..
src	Merge branch 'feature_validate_service_format' into feature_naming_ap	2019-02-14 19:24:48 +08:00
pom.xml	release 0.8	2019-01-22 22:16:13 +08:00