study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity
747 Commits 11 Branches 30 Tags
Commit Graph

747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiaojing
65ce68ebaa
Update README.md 2019-01-29 10:08:44 +08:00
xiaojing
1267c36ab7
Merge pull request #319 from justlive1/master 
fixed netInterface NullPointerException
 2019-01-28 14:06:16 +08:00
justlive1
d3f98b66a4 fixed netInterface NullPointerException 2019-01-25 15:33:03 +08:00
xiaojing
a301c63f21
Merge pull request #309 from xiaolongzuo/master 
Fix code format error.
 2019-01-23 20:18:22 +08:00
format
a30c1525da
Merge pull request #306 from flystar32/master 
Add ans module unit test
 2019-01-22 16:58:10 +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
xiaolongzuo
22d168e3fe Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 2019-01-22 16:50:19 +08:00
xiaolongzuo
65397e861c Fix code format error. 2019-01-22 16:49:12 +08:00
xiaojing
72276f2ab8
Merge pull request #302 from pig4cloud/master 
fix #276
 2019-01-22 16:45:22 +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
flystar32
962abbb712 delete unused file 2019-01-22 14:02:43 +08:00
flystar32
523f039c95 add test case for ans module 2019-01-22 11:50:38 +08:00
mercyblitz
7fae608df4 Polish spring-cloud-incubator/spring-cloud-alibaba#263 2019-01-22 10:02:13 +08:00
mercyblitz
490e210a81 Bug fix : DubboServiceRegistrationAutoConfiguration does not work in some cases 2019-01-22 00:43:08 +08:00
mercyblitz
3c51f9f8d8 Polish the first GA for spring-cloud-alibaba-dubbo 2019-01-22 00:25:55 +08:00
冷冷
fc72c76a9d fix #276 2019-01-21 12:36:56 +08:00
fangjian0423
4a21d6a983 Merge remote-tracking branch 'upstream/master' 2019-01-21 10:30:29 +08:00
xiaojing
2fb0c24749
Merge pull request #300 from pig4cloud/master 
fix #294  #274 EnableCircuitBreaker error & add nacos gateway example
 2019-01-21 10:16:40 +08:00
小马哥
5c2b118523 Temporary commit 2019-01-19 23:21:24 +08:00
冷冷
aae2c1676b fix #274 add example. how to use spring cloud gateway with nacos 2019-01-19 13:01:10 +08:00
mercyblitz
f34e1883e3 Temporary commit 2019-01-19 11:54:45 +08:00
mercyblitz
26a05cbefb Temporary commit 2019-01-18 19:25:39 +08:00
冷冷
72bdfa2871 fix #294 EnableCircuitBreaker error 2019-01-18 19:11:53 +08:00
pbting
6ca806c313 add unit test for nacos config 2019-01-18 14:08:29 +08:00
pbting
431b246507 add nacos config unit test 2019-01-18 11:46:01 +08:00
xiaojing
2a858f2446
Merge pull request #289 from zhendong590/master 
update cobertura settings
 2019-01-18 11:00:33 +08:00
xiaojing
85e7abeee7
Merge pull request #292 from xiaolongzuo/master 
Fix SchedulerX cycle ref error.
 2019-01-18 10:58:53 +08:00
fangjian0423
6a758dd42f add sentinel datasource test case 2019-01-17 19:38:29 +08:00
fangjian0423
3ab6b1dc63 update nacos example & using final replace of protected in field 2019-01-17 19:30:09 +08:00
gaoyunpeng
a1902d9cf0 1.update cobertura settings 
2.fix endpoint's degradeRules return value
 2019-01-17 17:28:21 +08:00
chenzhu.zxl
2de5362f4d Fix SchedulerX cycle ref error. 2019-01-17 16:52:03 +08:00
pbting
78911998ca Comment some code for CircleCI 2019-01-17 16:18:37 +08:00
pbting
de394f352c add nacos config unit test 2019-01-17 15:43:35 +08:00
format
2a39bca22f
Merge pull request #282 from pbting/master 
nacos config bug fix
 2019-01-17 15:42:31 +08:00
xiaojing
0a35f65d8e
Merge pull request #285 from fangjian0423/master 
upgrade sentinel version to 1.4.1 and remove useless class
 2019-01-16 20:44:35 +08:00
fangjian0423
b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization 2019-01-16 20:20:21 +08:00
pbting
5b2ddacac8 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba 2019-01-16 20:01:24 +08:00
pbting
328a473da2 remote set port action 2019-01-16 20:01:10 +08:00
pbting
a32bf92ed0
Merge pull request #3 from spring-cloud-incubator/master 
同步一次代码
 2019-01-16 18:04:29 +08:00
pbting
eaf93fdc3f nacos config fix #277 2019-01-16 18:00:18 +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
a8564140e2
Merge pull request #2 from spring-cloud-incubator/master 
同步一次 最新代码
 2019-01-16 10:08:38 +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
pbting
4c53aa44f0
Merge pull request #279 from fangjian0423/master 
Refactor sentinel starter and add test case
 2019-01-16 10:05:44 +08:00
format
4f885d4c70
Merge pull request #275 from pbting/master-doc 
sms document
 2019-01-15 22:36:39 +08:00
xiaojing
a963d2c7bd
Merge pull request #281 from yanglbme/dev 
Small changes in doc and java file
 2019-01-15 22:33:33 +08:00
fangjian0423
1c638d85df update sentinel test case 2019-01-15 22:00:14 +08:00