12 Commits

Author	SHA1	Message	Date
xiaolongzuo	ca31245a8a	Polish	2019-02-25 15:00:11 +08:00
xiaolongzuo	2a83f3e84e	Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba ... # Conflicts: # spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java # spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java	2019-02-25 14:38:47 +08:00
xiaolongzuo	03bd2c3c1d	Add statistics for nacos discovery and test case	2019-02-21 15:09:20 +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
得少	997faff710	add nacos discovery starter support to connect to aliyun	2019-02-18 09:52:41 +08:00
xiaolongzuo	910068c91f	Add test case.	2019-02-13 17:16:52 +08:00
xiaolongzuo	8717bd0987	Update SCX tests javadoc.	2018-12-14 17:45:21 +08:00
xiaolongzuo	1fc98ebe7c	closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator.	2018-12-12 17:56:16 +08:00
xiaolongzuo	a95a323bc8	optimize spring-cloud-alicloud-context tests.	2018-10-30 14:53:29 +08:00
chenzhu.zxl	e74d54604d	fixes #71.	2018-10-29 18:09:23 +08:00
flystar32	bf7aec2fbc	do some housekeeping	2018-10-29 15:48:19 +08:00
chenzhu.zxl	7126a8ce33	closes #63, closes #64, closes #65, closes #66.	2018-10-26 19:08:12 +08:00