flystar32
|
9c04b327a1
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
6 years ago |
|
flystar32
|
26df5b7926
|
Fixes #363, #347
|
6 years ago |
|
xiaojing
|
9dee1a7f74
|
Merge pull request #362 from zhendong590/master
replace cobertura to jacoco
|
6 years ago |
gaoyunpeng
|
87bfb3734a
|
ignore failure testcase
|
6 years ago |
|
gaoyunpeng
|
394485a12d
|
replace cobertura to jacoco
|
6 years ago |
|
xiaojing
|
1a23c76689
|
Merge pull request #349 from flystar32/master
Nacos discovery support heart beat event
|
6 years ago |
|
flystar32
|
142c321fb0
|
Merge remote-tracking branch 'upstream/master'
|
6 years ago |
format
|
5d721d1673
|
Merge pull request #346 from carlWangTao/patch-1
Update NacosDiscoveryProperties.java
|
6 years ago |
|
flystar32
|
8d41c885c0
|
Fixes #352
|
6 years ago |
|
flystar32
|
7677507294
|
Polish #345 , fixes @AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class)
|
6 years ago |
|
xiaojing
|
d6334fbe87
|
Merge pull request #350 from xiaolongzuo/master
Add test case for alicloud-context.
|
6 years ago |
xiaolongzuo
|
5c26eb90e0
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
6 years ago |
|
xiaolongzuo
|
910068c91f
|
Add test case.
|
6 years ago |
|
flystar32
|
682d12f20e
|
Merge branch 'master' of github.com:flystar32/spring-cloud-alibaba
|
6 years ago |
|
flystar32
|
290350f6ec
|
add import
|
6 years ago |
|
flystar32
|
dfc9e34147
|
support heartbeat event
|
6 years ago |
|
flystar32
|
c43a89951b
|
support heartbeat event
|
6 years ago |
|
flystar32
|
b0c17fd291
|
support heartbeat event
|
6 years ago |
|
flystar32
|
c545885d1c
|
support heartbeat event
|
6 years ago |
carlWangTao
|
8d44c7ee01
|
Update NacosDiscoveryProperties.java
当配置属性cloud.nacos.discovery.server-addr以 '/' 结束会造成服务提供方无法注册到NacosServer
|
6 years ago |
Mercy Ma
|
e7b4a08f44
|
Merge pull request #339 from mercyblitz/master
[Module] Dubbo Spring Cloud
|
6 years ago |
|
mercyblitz
|
ff6e68d522
|
Update Dubbo Spring Boot 0.2.1.RELEASE
|
6 years ago |
|
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 |
|
xiaojing
|
13097fd32c
|
Merge pull request #338 from fangjian0423/binder-dev
remove sentinel commercialization logic & optimize NacosDataSource
|
6 years ago |
|
fangjian0423
|
fd6d3a7717
|
remove sentinel commercialization logic & optimize NacosDataSource
|
6 years ago |
|
format
|
78e5a0a380
|
Merge pull request #337 from flystar32/master
Fixes #331
|
6 years ago |
|
flystar32
|
e6a1ba09fb
|
Fixes #331
|
6 years ago |
|
xiaojing
|
c5fa7068a4
|
Update README-zh.md
|
6 years ago |
|
xiaojing
|
fe66f83da5
|
Update README-zh.md
|
6 years ago |
|
xiaojing
|
744788fd62
|
Update Roadmap.md
|
6 years ago |
|
xiaojing
|
2cb7123f00
|
Update Roadmap-zh.md
|
6 years ago |
|
xiaojing
|
1d47d3859f
|
Update Roadmap-zh.md
|
6 years ago |
|
xiaojing
|
41b3cb0968
|
Update Roadmap.md
|
6 years ago |
|
xiaojing
|
494e7ea117
|
Update README.md
|
6 years ago |
|
xiaojing
|
0dd3a1fb48
|
Update issue templates
|
6 years ago |
|
xiaojing
|
6296bd8b5d
|
Update issue templates
|
6 years ago |
|
format
|
a0612ec24c
|
Merge pull request #335 from flystar32/master
Fixes #333, make @EnableDiscoveryClient Optional
|
6 years ago |
|
flystar32
|
450f1e8269
|
modify example to verify .
|
6 years ago |
|
flystar32
|
4a62526b2a
|
Fixes #333 ,make @EnableDiscoveryClient Optional
|
6 years ago |
Spencer Gibb
|
a1ae7b50ed
|
Ignores broken test.
|
6 years ago |
|
xiaojing
|
04908741bb
|
Update readme-zh.md
|
6 years ago |
|
format
|
d01967b432
|
Merge pull request #330 from flystar32/master
Add a new Module Spring Cloud Alibaba Fescar, Polish #303
|
6 years ago |
|
flystar32
|
ef8d204f95
|
rename
|
6 years ago |
|
flystar32
|
30b6456558
|
resolve conflict
|
6 years ago |
|
flystar32
|
a6a894a110
|
add module Fescar, Polish #303
|
6 years ago |
|
xiaojing
|
efa89e6fea
|
Merge pull request #326 from xiaolongzuo/master
Polish java doc.
|
6 years ago |
|
xiaolongzuo
|
0acd1b0a53
|
Polish java doc.
|
6 years ago |
|
xiaolongzuo
|
d5d90d9c0a
|
Polish java doc.
|
6 years ago |
|
format
|
b3fffdda0e
|
Merge pull request #324 from flystar32/master
update Nacos version to 0.8.0, support Nacos discovery namespace ,Polish #295, #317
|
6 years ago |
|
flystar32
|
990bf1bff7
|
update nacos version to 0.8.0 ,Polish #295, #317
|
6 years ago |