xiaojing
|
cac7574396
|
Merge pull request #384 from Harris2012/patch-1
use EnableDiscoveryClient
|
2019-02-26 16:11:34 +08:00 |
|
mercyblitz
|
21f3451f7b
|
Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples
|
2019-02-26 14:52:47 +08:00 |
|
mercyblitz
|
b3c26c509e
|
Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper
|
2019-02-26 14:50:26 +08:00 |
|
xiaolongzuo
|
844d17b9f6
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
2019-02-26 10:54:27 +08:00 |
|
fangjian0423
|
84bb53f706
|
Merge remote-tracking branch 'upstream/master' into binder-dev
|
2019-02-25 16:28:30 +08:00 |
|
format
|
03f8defb09
|
Merge pull request #367 from zhendong590/master
aggregate multi report
|
2019-02-25 16:28:06 +08:00 |
|
fangjian0423
|
e537eb55de
|
resolve conflict
|
2019-02-25 15:31:03 +08:00 |
|
xiaolongzuo
|
2a83f3e84e
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
# Conflicts:
# spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
# spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
|
2019-02-25 14:38:47 +08:00 |
|
xiaolongzuo
|
fa5b57f3db
|
Polish test cases for schedulerx
|
2019-02-25 14:35:39 +08:00 |
|
fangjian0423
|
ac11a3a752
|
refactor sms module
|
2019-02-24 20:28:20 +08:00 |
|
Harris Zhang
|
10206af82b
|
use EnableDiscoveryClient
|
2019-02-24 11:16:56 +08:00 |
|
pbting
|
92519a7a09
|
Merge branch 'master' into master
|
2019-02-22 20:55:30 +08:00 |
|
gaoyunpeng
|
2db3677f20
|
fix #369 remove superfluous settings in fescar example
|
2019-02-21 16:03:57 +08:00 |
|
mercyblitz
|
2fdeeec3ff
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
# spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
|
2019-02-21 14:49:26 +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 |
|
得少
|
f777bc3006
|
remove alicloud context dependency
|
2019-02-19 16:53:37 +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 |
|
mercyblitz
|
fc8d8e3628
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1)
|
2019-02-19 15:05:25 +08:00 |
|
gaoyunpeng
|
394485a12d
|
replace cobertura to jacoco
|
2019-02-18 20:05:08 +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 |
|
fangjian0423
|
9f797f586e
|
update rocketmq binder demo
|
2019-02-02 13:44:33 +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
|
450f1e8269
|
modify example to verify .
|
2019-01-31 15:02:30 +08:00 |
|
xiaojing
|
04908741bb
|
Update readme-zh.md
|
2019-01-30 17:57:26 +08:00 |
|
flystar32
|
30b6456558
|
resolve conflict
|
2019-01-30 13:43:08 +08:00 |
|
flystar32
|
a6a894a110
|
add module Fescar, Polish #303
|
2019-01-30 13:40:26 +08:00 |
|
Xiaolong Zuo
|
e541aef538
|
Merge pull request #291 from fangjian0423/master
Add test case for sentinel datasource module
|
2019-01-22 16:55:20 +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 |
|
mercyblitz
|
054e95dd45
|
Revert nacos-discovery-consumer-example
|
2019-01-22 14:45:39 +08:00 |
|
冷冷
|
fc72c76a9d
|
fix #276
|
2019-01-21 12:36:56 +08:00 |
|
冷冷
|
aae2c1676b
|
fix #274 add example. how to use spring cloud gateway with nacos
|
2019-01-19 13:01:10 +08:00 |
|
mercyblitz
|
26a05cbefb
|
Temporary commit
|
2019-01-18 19:25:39 +08:00 |
|
fangjian0423
|
3ab6b1dc63
|
update nacos example & using final replace of protected in field
|
2019-01-17 19:30:09 +08:00 |
|
chenzhu.zxl
|
2de5362f4d
|
Fix SchedulerX cycle ref error.
|
2019-01-17 16:52:03 +08:00 |
|
pbting
|
de394f352c
|
add nacos config unit test
|
2019-01-17 15:43:35 +08:00 |
|
pbting
|
ada963c330
|
Update readme-zh.md
|
2019-01-16 12:57:42 +08:00 |
|
pbting
|
a56df0a0f0
|
Update readme-zh.md
|
2019-01-16 12:54:55 +08:00 |
|
pbting
|
2fb9b52f1d
|
Merge pull request #278 from zhendong590/master
update cobertura settings for reduce build time
|
2019-01-16 10:07:11 +08:00 |
|
gaoyunpeng
|
20eb325e59
|
update cobertura settings for reduce build time
|
2019-01-15 15:50:23 +08:00 |
|
pbting
|
0571a9ad60
|
add readme for example
|
2019-01-14 20:45:50 +08:00 |
|
小马哥
|
7aa17d3760
|
Temporary commit
|
2019-01-14 10:44:11 +08:00 |
|
mercyblitz
|
571d0eca15
|
Polish spring-cloud-incubator/spring-cloud-alibaba#262
|
2019-01-10 17:31:12 +08:00 |
|
得少
|
a4f8cc7d28
|
add spring enviroment extension module for examples
|
2019-01-09 23:02:04 +08:00 |
|
得少
|
ee2c696bdf
|
ans starter suport eureka/consule registry and add sms module
|
2019-01-09 18:38:08 +08:00 |
|
fangjian0423
|
0e75da3b8d
|
add ruleType property for AbstractDataSourceProperties and fixes #206
|
2018-12-26 22:38:34 +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 |
|