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
|
6 years ago |
flystar32
|
450f1e8269
|
modify example to verify .
|
6 years ago |
|
xiaojing
|
04908741bb
|
Update readme-zh.md
|
6 years ago |
|
flystar32
|
30b6456558
|
resolve conflict
|
6 years ago |
|
flystar32
|
a6a894a110
|
add module Fescar, Polish #303
|
6 years ago |
Xiaolong Zuo
|
e541aef538
|
Merge pull request #291 from fangjian0423/master
Add test case for sentinel datasource module
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
mercyblitz
|
054e95dd45
|
Revert nacos-discovery-consumer-example
|
6 years ago |
冷冷
|
fc72c76a9d
|
fix #276
|
6 years ago |
|
冷冷
|
aae2c1676b
|
fix #274 add example. how to use spring cloud gateway with nacos
|
6 years ago |
|
mercyblitz
|
26a05cbefb
|
Temporary commit
|
6 years ago |
fangjian0423
|
3ab6b1dc63
|
update nacos example & using final replace of protected in field
|
6 years ago |
chenzhu.zxl
|
2de5362f4d
|
Fix SchedulerX cycle ref error.
|
6 years ago |
pbting
|
ada963c330
|
Update readme-zh.md
|
6 years ago |
|
pbting
|
a56df0a0f0
|
Update readme-zh.md
|
6 years ago |
|
pbting
|
2fb9b52f1d
|
Merge pull request #278 from zhendong590/master
update cobertura settings for reduce build time
|
6 years ago |
gaoyunpeng
|
20eb325e59
|
update cobertura settings for reduce build time
|
6 years ago |
|
pbting
|
0571a9ad60
|
add readme for example
|
6 years ago |
|
小马哥
|
7aa17d3760
|
Temporary commit
|
6 years ago |
|
mercyblitz
|
571d0eca15
|
Polish spring-cloud-incubator/spring-cloud-alibaba#262
|
6 years ago |
|
得少
|
a4f8cc7d28
|
add spring enviroment extension module for examples
|
6 years ago |
|
得少
|
ee2c696bdf
|
ans starter suport eureka/consule registry and add sms module
|
6 years ago |
|
fangjian0423
|
0e75da3b8d
|
add ruleType property for AbstractDataSourceProperties and fixes #206
|
6 years ago |
Spencer Gibb
|
612e6913e6
|
Update to 0.2.2.BUILD-SNAPSHOT
|
6 years ago |
|
Spencer Gibb
|
b28e82dc3c
|
Update SNAPSHOT to 0.2.1.RELEASE
|
6 years ago |
|
fangjian0423
|
89178bc913
|
update docs
|
6 years ago |
|
fangjian0423
|
d204a54b76
|
Optimize Sentinel RestTemplate url resource
|
6 years ago |
|
chenzhu.zxl
|
f1bd3fd2c2
|
Add SchedulerX modules.
|
6 years ago |
|
chenzhu.zxl
|
9708503b8e
|
Delete SchedulerX modules.
|
6 years ago |
|
Xiaolong Zuo
|
6a536063cf
|
Merge pull request #164 from xiaolongzuo/master
closes #162, fixes #138.
|
6 years ago |
|
xiaolongzuo
|
1fc98ebe7c
|
closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator.
|
6 years ago |
|
fangjian0423
|
7d3a1b9adf
|
add transaction message in rocketmq example
|
6 years ago |
|
flystar32
|
b389112c6b
|
update example configuration
|
6 years ago |
|
fangjian0423
|
f40381fc6c
|
update docs
|
6 years ago |
|
fangjian0423
|
0af67df3e3
|
using sentinel feign in nacos discovery example
|
6 years ago |
|
fangjian0423
|
53643b94ce
|
fixes #9
|
6 years ago |
|
fangjian0423
|
25aecfe1ad
|
update docs
|
6 years ago |
|
fangjian0423
|
baea051027
|
update rocketmq example
|
6 years ago |
|
fangjian0423
|
7d039f4742
|
make metrics-core as provided dependency and refactor
|
6 years ago |
|
format
|
47b1f05e86
|
Merge pull request #119 from mercyblitz/master
[Feature] Add Spring Cloud Bus module for Apache RocketMQ
|
6 years ago |
|
mercyblitz
|
6e175b35d5
|
Fix bugs on example
|
6 years ago |
|
mercyblitz
|
b75b19b58c
|
Polish Spring Cloud Bus
|
6 years ago |
|
fangjian0423
|
9e9ca72c88
|
update rocketmq example
|
6 years ago |
|
fangjian0423
|
f79fdba50b
|
update sentinel docs
|
6 years ago |
|
fangjian0423
|
bfae54b51e
|
using eclipse code formatter to format code
|
6 years ago |
|
fangjian0423
|
3a4baa156a
|
add rocketmq example
|
6 years ago |
|
fangjian0423
|
4539ed7183
|
update sentinel example and add sentinel reference doc
|
6 years ago |
|
xiaolongzuo
|
f2e83f020d
|
Add ANS and ACM readme doc.
|
6 years ago |
|
xiaolongzuo
|
537c434d11
|
Fix build error。
|
6 years ago |