yunzheng1228
|
a543be5f9f
|
Format log naming
|
2019-02-25 16:44:08 +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
|
83d0220c73
|
Merge remote-tracking branch 'upstream/master' into binder-dev
|
2019-02-25 15:31:26 +08:00 |
|
fangjian0423
|
e537eb55de
|
resolve conflict
|
2019-02-25 15:31:03 +08:00 |
|
xiaolongzuo
|
ca31245a8a
|
Polish
|
2019-02-25 15:00:11 +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 |
|
Xiaolong Zuo
|
e8aaa3e948
|
Merge pull request #373 from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul
Feature spring cloud alibaba sentinel zuul
|
2019-02-25 11:37:03 +08:00 |
|
fangjian0423
|
ac11a3a752
|
refactor sms module
|
2019-02-24 20:28:20 +08:00 |
|
fangjian0423
|
7fe95726ee
|
Sentinel Endpoint add appName
|
2019-02-24 20:27:49 +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 |
|
得少
|
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 |
|
tiger
|
ffb71e3eaf
|
change listener to use SmartInitializingSingleton
|
2019-02-22 18:09:35 +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 |
|
tiger
|
ac25e4a9dc
|
add sentinel-zuul-adapter dependency
|
2019-02-21 16:32:01 +08:00 |
|
gaoyunpeng
|
d76198a18d
|
resolve conflicts
|
2019-02-21 16:12:13 +08:00 |
|
gaoyunpeng
|
880a894786
|
there is not need deploy to maven so add settings for it
|
2019-02-21 16:03:57 +08:00 |
|
gaoyunpeng
|
852e287481
|
rename coverage module name
|
2019-02-21 16:03:57 +08:00 |
|
gaoyunpeng
|
2db3677f20
|
fix #369 remove superfluous settings in fescar example
|
2019-02-21 16:03:57 +08:00 |
|
gaoyunpeng
|
9dac4efd37
|
aggregate multi report
|
2019-02-21 16:03:57 +08:00 |
|
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 |
|
yunzheng1228
|
33e7cd6930
|
Adding yunzheng to developers
|
2019-02-20 20:39:59 +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 |
|