1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

243 Commits

Author SHA1 Message Date
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
flystar32
7fdd8fa3e2 update sentinel version to 0.2.0 2018-10-11 21:48:35 +08:00
format
319f249021
Merge pull request #35 from flystar32/master
Fixes #32 support fileExtension yaml and yml
2018-10-11 16:32:12 +08:00
亦盏
7aae272318 Fixes #32 support fileExtension yaml and yml 2018-10-09 20:29:45 +08:00
flystar32
52a0c6f9de update version to 0.2.0 2018-10-08 20:29:39 +08:00
mercyblitz
52ced1a956 Polish spring-cloud-incubator/spring-cloud-alibaba#34 : Initialize spring-cloud-alibaba-nacos-config-server module 2018-10-04 01:04:17 +08:00
flystar32
8a0c087415 update nacos version to 0.2.1 2018-09-30 11:21:29 +08:00
fangjian0423
8702fe00ae refactor storage module: rename storage to oss 2018-09-30 11:01:48 +08:00
fangjian0423
7c1699dcd8 update sentinel examples and metadata info to support new configurations of sentinel 2018-09-27 14:32:08 +08:00
format
117f4f70c6
Merge pull request #29 from xiejiashuai/featrue/support_more_configuration
Featrue/support more sentinel configuration
2018-09-27 14:14:19 +08:00
xiejiashuai
6794c350ef 优化代码 2018-09-27 13:33:29 +08:00
xiejiashuai
03a64885d4 修改代码风格为eclipse风格 2018-09-27 10:08:23 +08:00
flystar32
b0011bf328 rename alibaba storage to alicloud storage 2018-09-26 10:52:47 +08:00
Neptune
883b7cbcbf
Merge pull request #1 from spring-cloud-incubator/master
Merge
2018-09-22 15:47:56 +08:00
xiejiashuai
156404554e 去除多余的导入包 2018-09-22 10:30:15 +08:00
xiejiashuai
c483b2fa2b 优化代码 2018-09-22 10:26:34 +08:00
xiejiashuai
9e5de2eabb add author 2018-09-21 21:24:15 +08:00
flystar32
e42225fbcc update nacos config properties , content-type to file-extension 2018-09-20 14:28:42 +08:00
flystar32
b4ec84c078 update example readme nacos port to 8848 2018-09-20 11:43:27 +08:00
flystar32
e4d9f98313 update nacos version to 0.2.1-RC and format code 2018-09-20 11:31:50 +08:00
xiaojing
2d277e42c1
Merge pull request #25 from liaozan/master
remove unnecessary comment
2018-09-19 12:33:15 +08:00