 fangjian0423
|
e537eb55de
|
resolve conflict
|
2019-02-25 15:31:03 +08:00 |
|
 pbting
|
92519a7a09
|
Merge branch 'master' into master
|
2019-02-22 20:55:30 +08:00 |
|
|
得少
|
3934115863
|
1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
|
2019-02-22 20:45:58 +08:00 |
|
 flystar32
|
c6d863994d
|
update reference doc
|
2019-02-22 16:02:49 +08:00 |
|
 Mercy Ma
|
45060be7ec
|
Merge pull request #368 from mercyblitz/master
Dubbo Spring Cloud
|
2019-02-22 13:36:02 +08:00 |
|
|
mercyblitz
|
6daba36e35
|
Fix the issues of test cases
|
2019-02-22 13:26:36 +08:00 |
|
|
mercyblitz
|
0337f0fa6c
|
Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud
|
2019-02-22 12:39:29 +08:00 |
|
|
mercyblitz
|
129be0db26
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-22 11:52:13 +08:00 |
|
|
mercyblitz
|
c6d52409f3
|
Polish spring-cloud-incubator/spring-cloud-alibaba#379 : Add Dubbo Spring Cloud Starter
|
2019-02-22 11:48:39 +08:00 |
|
|
mercyblitz
|
47733ea41f
|
Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud
|
2019-02-22 11:36:54 +08:00 |
|
|
mercyblitz
|
3f6904f5ff
|
Polish spring-cloud-incubator/spring-cloud-alibaba#376 : Reactor
|
2019-02-22 11:11:14 +08:00 |
|
|
mercyblitz
|
918e052cd6
|
Polish spring-cloud-incubator/spring-cloud-alibaba#376 : Dubbo Metadata Configuration replaces Nacos 's implementation
|
2019-02-22 11:09:05 +08:00 |
|
|
mercyblitz
|
80252f8278
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor
|
2019-02-21 23:59:23 +08:00 |
|
|
mercyblitz
|
a150a0cec6
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Add @PathVariable support
|
2019-02-21 18:11:03 +08:00 |
|
|
flystar32
|
5bb6073880
|
auto configure after AutoServiceRegistrationConfiguration.class
|
2019-02-21 15:48:04 +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 |
|
|
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 |
|