13 Commits

Author	SHA1	Message	Date
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
fangjian0423	aa03ddbbe2	#734 -> update maven coordinates	2019-07-08 11:38:30 +08:00
mercyblitz	2fdeeec3ff	Merge remote-tracking branch 'upstream/master' ... # Conflicts: # spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc # spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc	2019-02-21 14:49:26 +08:00
format	9b84df9015	Merge pull request #358 from pbting/master ... nacos discovery starter support connect to aliyun with master branch	2019-02-19 16:41:44 +08:00
flystar32	c43a89951b	support heartbeat event	2019-02-13 15:11:12 +08:00
pbting	431b246507	add nacos config unit test	2019-01-18 11:46:01 +08:00
flystar32	36c20f5ab1	fixes some typo	2019-01-04 11:36:01 +08:00
flystar32	7525b92b9d	add test case	2019-01-04 10:33:25 +08:00
flystar32	31d4bb5a36	use constructor parameters instead of autowired	2019-01-02 17:28:05 +08:00
亦盏	47cab99b2c	separate registry and discovery	2018-10-17 17:49:19 +08:00
flystar32	2466cbddb8	Fixes #13	2018-09-17 11:29:52 +08:00
flystar32	43d47ae71f	add module nacos-config and nacos-discovery	2018-09-15 11:54:53 +08:00