mercyblitz
|
a5e950186f
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
# spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
# spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
# spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
|
2019-02-01 22:08:21 +08:00 |
|
flystar32
|
e6a1ba09fb
|
Fixes #331
|
2019-02-01 12:48:43 +08:00 |
|
flystar32
|
4a62526b2a
|
Fixes #333 ,make @EnableDiscoveryClient Optional
|
2019-01-31 14:57:30 +08:00 |
|
Spencer Gibb
|
a1ae7b50ed
|
Ignores broken test.
|
2019-01-30 16:25:59 -05:00 |
|
mercyblitz
|
59a969049d
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# pom.xml
# spring-cloud-alibaba-dependencies/pom.xml
# spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
|
2019-01-22 14:51:54 +08:00 |
|
flystar32
|
962abbb712
|
delete unused file
|
2019-01-22 14:02:43 +08:00 |
|
flystar32
|
523f039c95
|
add test case for ans module
|
2019-01-22 11:50:38 +08:00 |
|
pbting
|
328a473da2
|
remote set port action
|
2019-01-16 20:01:10 +08:00 |
|
得少
|
41020df6b9
|
code optimization
|
2019-01-10 22:16:55 +08:00 |
|
得少
|
bea88fb2c8
|
add constant for MigrateRefreshEventListener and AnsServerList
|
2019-01-10 13:26:02 +08:00 |
|
得少
|
b16ef5efea
|
fix bug for ansServer id
|
2019-01-10 11:44:49 +08:00 |
|
得少
|
e163500980
|
Code optimization for ans starter
|
2019-01-10 10:16:01 +08:00 |
|
得少
|
ee2c696bdf
|
ans starter suport eureka/consule registry and add sms module
|
2019-01-09 18:38:08 +08:00 |
|
Spencer Gibb
|
612e6913e6
|
Update to 0.2.2.BUILD-SNAPSHOT
|
2018-12-21 11:09:29 -05:00 |
|
Spencer Gibb
|
b28e82dc3c
|
Update SNAPSHOT to 0.2.1.RELEASE
|
2018-12-21 10:48:36 -05: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 |
|
Spencer Gibb
|
6e355cc807
|
Update to 0.2.1.BUILD-SNAPSHOT
|
2018-10-30 17:25:19 -04:00 |
|
Spencer Gibb
|
d2fd77c274
|
Update SNAPSHOT to 0.2.0.RELEASE
|
2018-10-30 17:11:50 -04:00 |
|
flystar32
|
5873ac3c1a
|
update example configuration
|
2018-10-30 15:29:31 +08:00 |
|
flystar32
|
e6c7c823d6
|
update ans pom.xml
|
2018-10-30 12:50:28 +08:00 |
|
chenzhu.zxl
|
7126a8ce33
|
closes #63, closes #64, closes #65, closes #66.
|
2018-10-26 19:08:12 +08:00 |
|