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
263 Commits 11 Branches 30 Tags
Commit Graph

263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xiaojing
389c08cdbb
Merge pull request #81 from xiaolongzuo/master 
Fix configuration specification
 2018-10-30 21:31:18 +08:00
xiaolongzuo
6ca15d0f2f Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 2018-10-30 20:54:29 +08:00
xiaolongzuo
384d55b2cf Fix configuration specification. 2018-10-30 20:52:07 +08:00
xiaolongzuo
9922e934ac Fix configuration specification. 2018-10-30 20:51:40 +08:00
flystar32
742a039ccd update sentinel version to 1.3.0-GA 2018-10-30 20:41:52 +08:00
xiaojing
caf9104009
Merge pull request #77 from xiaolongzuo/master 
Extract acm configuration to bootstrap phase and optimize error message.
 2018-10-30 16:21:29 +08:00
xiaolongzuo
32e55ca78b Extract acm configuration to bootstrap phase. 2018-10-30 15:59:38 +08:00
flystar32
3afa47f87c update nacos version to 0.3.0 2018-10-30 15:43:19 +08:00
flystar32
5873ac3c1a update example configuration 2018-10-30 15:29:31 +08:00
xiaolongzuo
a95a323bc8 optimize spring-cloud-alicloud-context tests. 2018-10-30 14:53:29 +08:00
flystar32
e6c7c823d6 update ans pom.xml 2018-10-30 12:50:28 +08:00
xiaolongzuo
f0e2e0732e optimize error message. 2018-10-30 11:17:18 +08:00
flystar32
a5905307f0 fix tests 2018-10-30 10:20:31 +08:00
flystar32
7323880c01 fix get active profiles 2018-10-29 23:17:51 +08:00
flystar32
45e4ec3a84 put all nacos config metadata to bootstrap 2018-10-29 22:59:46 +08:00
flystar32
a60402beaf update readme of nacos config example 2018-10-29 22:20:25 +08:00
flystar32
3acfc67d6a put all nacos config metadata to bootstrap 2018-10-29 22:16:15 +08:00
xiaojing
f4a2ddaf4b
Merge pull request #72 from xiaolongzuo/master 
fixes #71.
 2018-10-29 19:51:21 +08:00
chenzhu.zxl
e74d54604d fixes #71. 2018-10-29 18:09:23 +08:00
flystar32
bf7aec2fbc do some housekeeping 2018-10-29 15:48:19 +08:00
xiaojing
721df2850e
Merge pull request #69 from xiaolongzuo/master 
Detele diamond health check.
 2018-10-29 14:50:32 +08:00
Xiaolong Zuo
62402b8834
Detele diamond health check. 2018-10-29 11:09:00 +08:00
xiaojing
6a2b578c7e
Merge pull request #67 from xiaolongzuo/master 
closes #63, closes #64, closes #65, closes #66.
 2018-10-29 10:13:05 +08:00
Xiaolong Zuo
5cf6d56393
Delete OSSController.java 2018-10-29 10:05:48 +08:00
Xiaolong Zuo
6779cab2b8
Delete OSSApplication.java 2018-10-29 10:05:34 +08:00
chenzhu.zxl
2f8f0bb28b rename OssApplication and OssController. 2018-10-29 10:04:28 +08:00
chenzhu.zxl
7126a8ce33 closes #63, closes #64, closes #65, closes #66. 2018-10-26 19:08:12 +08:00
flystar32
591350d7e0 update readme 2018-10-26 11:21:23 +08:00
format
3ccf9b1470
Merge pull request #59 from fangjian0423/master 
sentinel add logs to query datasource process.
 2018-10-25 11:12:24 +08:00
fangjian0423
1d44d73eba sentinel add logs to query datasource process. 2018-10-25 10:43:01 +08:00
xiaojing
252b33f562
Merge pull request #55 from fangjian0423/master 
Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource.
 2018-10-24 17:24:07 +08:00
flystar32
e00d83ca67 update version of spring-cloud-commons, spring-cloud-build and spring-cloud-dependencied-parent 2018-10-24 11:39:54 +08:00
fangjian0423
00aeb90df2 Updates to snapshot versions 2018-10-24 10:51:34 +08:00
fangjian0423
ff2c390673 Merge remote-tracking branch 'upstream/master' 2018-10-24 10:48:47 +08:00
fangjian0423
1d15cdaee5 Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel. 2018-10-24 10:38:23 +08:00
Spencer Gibb
4fb7879ec4
Adds spring profile to circleci 2018-10-23 16:21:40 -04:00
Spencer Gibb
2f0f106fa8
Adds circleci support 2018-10-23 16:17:08 -04:00
Spencer Gibb
ece4531833
Updates to snapshot versions 2018-10-23 14:45:58 -04:00
format
a21343d589
Merge pull request #53 from flystar32/master 
update nacos version to 0.3.0-RC1
 2018-10-22 20:00:15 +08:00
flystar32
f449986650 separate namingservice from nacosregistration and discoveryclient 2018-10-22 19:37:50 +08:00
亦盏
680a5eef01 update nacos version to 0.3.0-RC1 2018-10-22 18:38:39 +08:00
Neptune
256c9d367c
Merge pull request #3 from spring-cloud-incubator/master 
Merge
 2018-10-21 18:04:15 +08:00
format
6b7924be89
Merge pull request #47 from flystar32/master 
separate registry and discovery, Fixes #42
 2018-10-19 20:52:21 +08:00
亦盏
47cab99b2c separate registry and discovery 2018-10-17 17:49:19 +08:00
fangjian0423
1ce28f00f3 converter property fix 2018-10-17 16:04:44 +08:00
fangjian0423
7566d69406 Merge remote-tracking branch 'origin/master' 2018-10-17 11:05:53 +08:00
fangjian0423
568da97adf Fixes #43 add rules automation 2018-10-17 11:05:43 +08:00
format
1e8fd6ee16
Merge pull request #44 from flystar32/master 
add management info to registry metadata, Fixes #41
 2018-10-17 10:36:26 +08:00
fangjian0423
4829157c09 update comments and docs 2018-10-16 16:39:47 +08:00
亦盏
c4043b5c12 add management info to registry metadata 2018-10-16 15:39:23 +08:00