tiger
|
19af007931
|
update spring cloud version
|
2019-02-21 15:51:01 +08:00 |
|
flystar32
|
5bb6073880
|
auto configure after AutoServiceRegistrationConfiguration.class
|
2019-02-21 15:48:04 +08:00 |
|
tiger
|
356f07a509
|
remove version and format code
|
2019-02-21 15:34:21 +08:00 |
|
tiger
|
3afd0177e5
|
Merge branch 'master' into feature-spring-cloud-alibaba-sentinel-zuul
# Conflicts:
# pom.xml
|
2019-02-21 15:26:27 +08:00 |
|
tiger
|
1c759ec8d5
|
add spring-cloud-alibaba-sentinel-zuul module
|
2019-02-21 15:18:34 +08:00 |
|
xiaolongzuo
|
03bd2c3c1d
|
Add statistics for nacos discovery and test case
|
2019-02-21 15:09:20 +08:00 |
|
mercyblitz
|
969dece586
|
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:53:05 +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 |
|
mercyblitz
|
3e39f03380
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor to unify parameters resolving
|
2019-02-21 14:47:28 +08:00 |
|
flystar32
|
2cfabd353a
|
format code and change apache log to slf4j
|
2019-02-21 14:36:52 +08:00 |
|
flystar32
|
f96869e1d2
|
format code and change logger to log
|
2019-02-21 11:37:17 +08:00 |
|
Xiaolong Zuo
|
e6c7b10b79
|
Merge pull request #365 from fangjian0423/master
upgrade sentinel version & update docs & refactor log
|
2019-02-21 10:33:20 +08:00 |
|
mercyblitz
|
5becc06535
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Update test cases
|
2019-02-21 01:42:54 +08:00 |
|
gaoyunpeng
|
46e5cb8acb
|
aggregate multi report
|
2019-02-20 20:55:42 +08:00 |
|
fangjian0423
|
ca249d213e
|
upgrade sentinel version to 1.4.2
|
2019-02-20 17:55:05 +08:00 |
|
fangjian0423
|
0e8933e1f8
|
update sentinel docs & refactor
|
2019-02-20 17:05:59 +08:00 |
|
mercyblitz
|
a49f6622d7
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Performance optimization
|
2019-02-20 16:21:56 +08:00 |
|
mercyblitz
|
2f5ac6b7ad
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Add The resolvers of Dubbo Generic Method parameters.
|
2019-02-20 16:14:10 +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 |
|
mercyblitz
|
c0430abcae
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor
|
2019-02-20 01:31:22 +08:00 |
|
mercyblitz
|
d05c437d89
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Bug fixes
|
2019-02-19 18:35:11 +08:00 |
|
mercyblitz
|
4b1c3c6454
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 2)
|
2019-02-19 17:59:46 +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 |
|
得少
|
f777bc3006
|
remove alicloud context dependency
|
2019-02-19 16:53:37 +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 |
|
mercyblitz
|
0b31eccbf0
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-19 15:08:24 +08:00 |
|
mercyblitz
|
5099ed782c
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1)
|
2019-02-19 15:08:11 +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
|
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 |
|
fangjian0423
|
77fedf72b4
|
Merge remote-tracking branch 'upstream/master' into binder-dev
|
2019-02-18 10:49:23 +08:00 |
|
flystar32
|
8d41c885c0
|
Fixes #352
|
2019-02-18 10:43:06 +08:00 |
|