12 Commits

Author	SHA1	Message	Date
flystar32	62d3692dd1	add group information in getServices	2019-08-22 13:55:05 +08:00
flystar32	e419cac829	support nacos discovery group	2019-08-22 11:37:40 +08:00
format	1d04169cc3	Merge pull request #854 from lyuzb/master ... fix #851	2019-08-19 14:48:49 +08:00
lyuzb	9926c2bc88	fix #851	2019-08-17 23:14:32 +08:00
yidadi	e2024a441d	Optimizing and reusing code	2019-08-15 09:30:45 +08:00
lyuzb	1525b2855f	fix #831	2019-08-12 22:54:15 +08:00
mercyblitz	89ad537f66	To filter null , disable or unhealthy Nacos instances	2019-08-01 13:36:28 +08:00
mercyblitz	a701f8ca74	Let the private to be public	2019-08-01 13:07:05 +08:00
fangjian0423	04434bf977	update docs	2019-07-29 14:45:52 +08:00
ly	2b872b09e7	Merge branch 'master' into issues765	2019-07-23 23:17:19 +08:00
ly	7301700a90	Merge branch 'master' into issues765 ... # Conflicts: # spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java	2019-07-23 23:11:23 +08:00
ly	1de313079c	Merge code from upstream	2019-07-23 21:40:11 +08:00