fangjian0423
|
0e8933e1f8
|
update sentinel docs & refactor
|
2019-02-20 17:05:59 +08:00 |
|
Xiaolong Zuo
|
6080f09794
|
Merge pull request #364 from fangjian0423/master
Updates to spring cloud greenwich
|
2019-02-20 15:51:43 +08:00 |
|
flystar32
|
d7665170ec
|
format code
|
2019-02-20 15:35:44 +08:00 |
|
fangjian0423
|
1dc80d7a6f
|
Updates to spring cloud greenwich
|
2019-02-19 17:01:09 +08:00 |
|
pbting
|
95060a19b1
|
Update pom.xml
remove alicloud context maven dependency
|
2019-02-19 16:55:59 +08:00 |
|
pbting
|
c8f1697c3d
|
Update pom.xml
remove alicloud context
|
2019-02-19 16:55:16 +08:00 |
|
fangjian0423
|
94a3bc2cc2
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-19 16:45:19 +08:00 |
|
format
|
9b84df9015
|
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
|
2019-02-19 16:41:44 +08:00 |
|
flystar32
|
49cfaff25a
|
change log from apache common to slf4j
|
2019-02-19 16:29:06 +08:00 |
|
flystar32
|
27d5e01bac
|
change log to slf4j
|
2019-02-19 16:12:46 +08:00 |
|
flystar32
|
c1b7a3756a
|
set default value of nacos config enabled to true
|
2019-02-19 15:58:33 +08:00 |
|
flystar32
|
9c04b327a1
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
2019-02-19 15:56:27 +08:00 |
|
flystar32
|
26df5b7926
|
Fixes #363, #347
|
2019-02-19 15:56:09 +08:00 |
|
fangjian0423
|
f136ad1aab
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-19 15:40:41 +08:00 |
|
xiaojing
|
9dee1a7f74
|
Merge pull request #362 from zhendong590/master
replace cobertura to jacoco
|
2019-02-19 15:40:04 +08:00 |
|
fangjian0423
|
2d91206357
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-19 15:38:27 +08:00 |
|
gaoyunpeng
|
87bfb3734a
|
ignore failure testcase
|
2019-02-18 21:46:02 +08:00 |
|
gaoyunpeng
|
394485a12d
|
replace cobertura to jacoco
|
2019-02-18 20:05:08 +08:00 |
|
得少
|
24400635e2
|
update the log information print by conditional
|
2019-02-18 19:08:16 +08:00 |
|
xiaojing
|
1a23c76689
|
Merge pull request #349 from flystar32/master
Nacos discovery support heart beat event
|
2019-02-18 17:19:09 +08:00 |
|
flystar32
|
142c321fb0
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-18 17:09:27 +08:00 |
|
得少
|
e4cc98b90c
|
update the log information
|
2019-02-18 15:10:50 +08:00 |
|
fangjian0423
|
29cfe3537f
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-18 14:33:03 +08:00 |
|
format
|
5d721d1673
|
Merge pull request #346 from carlWangTao/patch-1
Update NacosDiscoveryProperties.java
|
2019-02-18 14:32:04 +11:00 |
|
flystar32
|
8d41c885c0
|
Fixes #352
|
2019-02-18 10:43:06 +08:00 |
|
得少
|
997faff710
|
add nacos discovery starter support to connect to aliyun
|
2019-02-18 09:52:41 +08:00 |
|
pbting
|
90a7769180
|
Merge pull request #4 from spring-cloud-incubator/master
Synchronize code once
|
2019-02-15 13:48:34 +08:00 |
|
flystar32
|
7677507294
|
Polish #345 , fixes @AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class)
|
2019-02-14 10:46:51 +08:00 |
|
xiaojing
|
d6334fbe87
|
Merge pull request #350 from xiaolongzuo/master
Add test case for alicloud-context.
|
2019-02-13 19:05:05 +08:00 |
|
xiaolongzuo
|
5c26eb90e0
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
2019-02-13 17:17:26 +08:00 |
|
xiaolongzuo
|
910068c91f
|
Add test case.
|
2019-02-13 17:16:52 +08:00 |
|
flystar32
|
682d12f20e
|
Merge branch 'master' of github.com:flystar32/spring-cloud-alibaba
|
2019-02-13 15:23:03 +08:00 |
|
flystar32
|
290350f6ec
|
add import
|
2019-02-13 15:20:57 +08:00 |
|
flystar32
|
dfc9e34147
|
support heartbeat event
|
2019-02-13 15:13:03 +08:00 |
|
flystar32
|
c43a89951b
|
support heartbeat event
|
2019-02-13 15:11:12 +08:00 |
|
flystar32
|
b0c17fd291
|
support heartbeat event
|
2019-02-13 15:10:27 +08:00 |
|
flystar32
|
c545885d1c
|
support heartbeat event
|
2019-02-13 15:09:59 +08:00 |
|
carlWangTao
|
8d44c7ee01
|
Update NacosDiscoveryProperties.java
当配置属性cloud.nacos.discovery.server-addr以 '/' 结束会造成服务提供方无法注册到NacosServer
|
2019-02-12 09:51:40 +08:00 |
|
Mercy Ma
|
e7b4a08f44
|
Merge pull request #339 from mercyblitz/master
[Module] Dubbo Spring Cloud
|
2019-02-01 22:42:48 +08:00 |
|
mercyblitz
|
ff6e68d522
|
Update Dubbo Spring Boot 0.2.1.RELEASE
|
2019-02-01 22:33:47 +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 |
|
xiaojing
|
13097fd32c
|
Merge pull request #338 from fangjian0423/binder-dev
remove sentinel commercialization logic & optimize NacosDataSource
|
2019-02-01 17:26:38 +08:00 |
|
fangjian0423
|
fd6d3a7717
|
remove sentinel commercialization logic & optimize NacosDataSource
|
2019-02-01 14:04:54 +08:00 |
|
format
|
78e5a0a380
|
Merge pull request #337 from flystar32/master
Fixes #331
|
2019-02-01 13:00:04 +08:00 |
|
flystar32
|
e6a1ba09fb
|
Fixes #331
|
2019-02-01 12:48:43 +08:00 |
|
xiaojing
|
c5fa7068a4
|
Update README-zh.md
|
2019-02-01 11:28:10 +08:00 |
|
xiaojing
|
fe66f83da5
|
Update README-zh.md
|
2019-02-01 11:21:48 +08:00 |
|
xiaojing
|
744788fd62
|
Update Roadmap.md
|
2019-02-01 10:45:13 +08:00 |
|
xiaojing
|
2cb7123f00
|
Update Roadmap-zh.md
|
2019-02-01 10:43:49 +08:00 |
|
xiaojing
|
1d47d3859f
|
Update Roadmap-zh.md
|
2019-02-01 10:42:57 +08:00 |
|