1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

45 Commits

Author SHA1 Message Date
gaoyunpeng
394485a12d replace cobertura to jacoco 2019-02-18 20:05:08 +08:00
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
a6a894a110 add module Fescar, Polish #303 2019-01-30 13:40:26 +08:00
mercyblitz
744e33229a 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 15:16:21 +08: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
gaoyunpeng
a1902d9cf0 1.update cobertura settings
2.fix endpoint's degradeRules return value
2019-01-17 17:28:21 +08:00
gaoyunpeng
20eb325e59 update cobertura settings for reduce build time 2019-01-15 15:50:23 +08:00
mercyblitz
571d0eca15 Polish spring-cloud-incubator/spring-cloud-alibaba#262 2019-01-10 17:31:12 +08:00
pbting
d74e0af32c
Merge branch 'master' into master 2019-01-10 14:51:27 +08:00
得少
2952101e1f pom add sms module 2019-01-10 14:43:08 +08:00
gaoyunpeng
851faf2bdb update cobertura settings 2019-01-09 18:54:23 +08:00
gaoyunpeng
7b69461361 update build command 2019-01-09 14:59:46 +08:00
gaoyunpeng
e28d24ba4a update cobertura settings 2019-01-08 14:10:54 +08:00
gaoyunpeng
33b947df6e add cobertura 2019-01-04 17:17:24 +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
chenzhu.zxl
f1bd3fd2c2 Add SchedulerX modules. 2018-12-13 15:04:00 +08:00
chenzhu.zxl
9708503b8e Delete SchedulerX modules. 2018-12-13 14:52:27 +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
fangjian0423
7d039f4742 make metrics-core as provided dependency and refactor 2018-11-28 17:13:59 +08:00
mercyblitz
b75b19b58c Polish Spring Cloud Bus 2018-11-23 14:52:45 +08:00
mercybltz
0ad0014cbf Polish spring-cloud-starter-bus-rocketmq 2018-11-22 13:02:33 +08:00
fangjian0423
d88e27e45c fix conflict 2018-11-20 12:00:36 +08:00
mercyblitz
b4b8fa0d19 Polish Config Server 2018-11-19 16:18:33 +08:00
小马哥
5fed9125a1
Merge branch 'master' into master 2018-11-16 10:07:46 +08:00
fangjian0423
d3d9de02a1 add rocketmq binder 2018-11-08 14:37:13 +08:00
fangjian0423
5c9c29b013 Polish #48 2018-11-06 17:04:59 +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
Spencer Gibb
f2f9f5f5bd
Updates to latest spring cloud dependencies 2018-10-30 16:38:41 -04:00
chenzhu.zxl
7126a8ce33 closes #63, closes #64, closes #65, closes #66. 2018-10-26 19:08:12 +08:00
xiaojing
252b33f562
Merge pull request #55 from fangjian0423/master
Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource.
2018-10-24 17:24:07 +08:00
flystar32
e00d83ca67 update version of spring-cloud-commons, spring-cloud-build and spring-cloud-dependencied-parent 2018-10-24 11:39:54 +08:00
fangjian0423
ff2c390673 Merge remote-tracking branch 'upstream/master' 2018-10-24 10:48:47 +08:00
fangjian0423
1d15cdaee5 Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel. 2018-10-24 10:38:23 +08:00
Spencer Gibb
ece4531833
Updates to snapshot versions 2018-10-23 14:45:58 -04:00
flystar32
52a0c6f9de update version to 0.2.0 2018-10-08 20:29:39 +08:00
mercyblitz
52ced1a956 Polish spring-cloud-incubator/spring-cloud-alibaba#34 : Initialize spring-cloud-alibaba-nacos-config-server module 2018-10-04 01:04:17 +08:00
fangjian0423
8702fe00ae refactor storage module: rename storage to oss 2018-09-30 11:01:48 +08:00
flystar32
b0011bf328 rename alibaba storage to alicloud storage 2018-09-26 10:52:47 +08:00
flystar32
43d47ae71f add module nacos-config and nacos-discovery 2018-09-15 11:54:53 +08:00
flystar32
ccc34d2faf refactor directory tree 2018-09-06 15:55:24 +08:00
flystar32
7b6d08a83c add a new module spring-cloud-alibaba-test 2018-09-04 11:32:43 +08:00
fangjian0423
7329fb5959 add storage starter 2018-08-31 19:23:45 +08:00
flystar32
0ce2df89ab hello, spring cloud alibaba 2018-07-27 19:18:12 +08:00