xiaojing
|
87099c6851
|
Merge pull request #80 from xiaolongzuo/1.x
Fix configuration specification
|
2018-10-30 21:32:15 +08:00 |
|
flystar32
|
f3794ae824
|
update sentinel version to 1.3.0-GA
|
2018-10-30 21:08:14 +08:00 |
|
xiaolongzuo
|
1c2c74e186
|
Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x
|
2018-10-30 20:54:01 +08:00 |
|
xiaolongzuo
|
5353abd199
|
Fix configuration specification.
|
2018-10-30 20:53:13 +08:00 |
|
xiaolongzuo
|
8b9b06e4e8
|
Fix configuration specification.
|
2018-10-30 20:52:55 +08:00 |
|
flystar32
|
6ed038ec2e
|
fix endpoint
|
2018-10-30 20:20:40 +08:00 |
|
xiaojing
|
f9603bf8f7
|
Merge pull request #78 from xiaolongzuo/1.x
Extract acm configuration to bootstrap phase.
|
2018-10-30 16:21:11 +08:00 |
|
xiaolongzuo
|
397d6e063a
|
Extract acm configuration to bootstrap phase.
# Conflicts:
# spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
|
2018-10-30 16:16:29 +08:00 |
|
xiaolongzuo
|
bc43637872
|
Extract acm configuration to bootstrap phase.
# Conflicts:
# spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
|
2018-10-30 16:12:39 +08:00 |
|
xiaojing
|
0ac96c0c20
|
Merge pull request #76 from xiaolongzuo/1.x
optimize spring-cloud-alicloud-oss module.
|
2018-10-30 15:43:28 +08:00 |
|
flystar32
|
3f1e00377e
|
update nacos version to 0.3.0
|
2018-10-30 15:37:17 +08:00 |
|
xiaolongzuo
|
7594313bea
|
optimize spring-cloud-alicloud-oss module.
|
2018-10-30 15:30:08 +08:00 |
|
xiaojing
|
b88d627543
|
Merge pull request #75 from xiaolongzuo/1.x
Add spring-cloud-alicloud-context tests.
|
2018-10-30 15:04:21 +08:00 |
|
xiaolongzuo
|
e2bacc4528
|
Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x
|
2018-10-30 14:51:03 +08:00 |
|
xiaolongzuo
|
b91f4a9758
|
Add spring-cloud-alicloud-context tests.
|
2018-10-30 14:47:46 +08:00 |
|
flystar32
|
c1d89868b5
|
update example configuration
|
2018-10-30 14:39:01 +08:00 |
|
flystar32
|
95913171cd
|
update ans pom.xml
|
2018-10-30 12:51:15 +08:00 |
|
flystar32
|
ad11b5b96f
|
Adds spring profile to circleci, Adds circleci support
|
2018-10-30 12:44:22 +08:00 |
|
format
|
255dea2c6b
|
Merge pull request #74 from flystar32/1.x
add acm and ans module
|
2018-10-30 11:50:27 +08:00 |
|
flystar32
|
c868ca2fa5
|
add acm and ans module
|
2018-10-30 11:48:28 +08:00 |
|
xiaojing
|
b702d891d6
|
Merge pull request #73 from xiaolongzuo/1.x
Optimize spring-cloud-alicloud-context module for branch 1.x
|
2018-10-30 11:19:48 +08:00 |
|
xiaolongzuo
|
c309993fe0
|
optimize error message.
|
2018-10-30 11:18:22 +08:00 |
|
xiaolongzuo
|
529926b99d
|
Delete invalid test cases.
|
2018-10-30 10:56:20 +08:00 |
|
flystar32
|
7b7cb91258
|
fix tests
|
2018-10-30 10:50:56 +08:00 |
|
xiaolongzuo
|
1445c0a007
|
Fix acm settings bug.
|
2018-10-30 10:32:52 +08:00 |
|
flystar32
|
a2b158d67d
|
put all nacos config metadata to bootstrap
|
2018-10-29 23:01:30 +08:00 |
|
xiaolongzuo
|
b3e22ba73c
|
Fix version error, ignore alicloud-context tests.
|
2018-10-29 19:45:53 +08:00 |
|
xiaojing
|
43a4f97907
|
Merge pull request #70 from xiaolongzuo/1.x
Add spring-cloud-alicloud-context module for branch 1.x
|
2018-10-29 15:00:57 +08:00 |
|
chenzhu.zxl
|
76cb758ca0
|
Add configuration-processor pom.
|
2018-10-29 14:46:58 +08:00 |
|
chenzhu.zxl
|
6503f8d2cf
|
Add spring-cloud-alicloud-context module.
|
2018-10-29 14:35:34 +08:00 |
|
format
|
056d4d9471
|
Merge pull request #60 from fangjian0423/1.x
sentinel add logs to query datasource process for branch 1.x.
|
2018-10-25 11:12:31 +08:00 |
|
fangjian0423
|
d924184fec
|
sentinel add logs to query datasource process.
|
2018-10-25 10:47:03 +08:00 |
|
xiaojing
|
5d82ab1c5a
|
Merge pull request #57 from fangjian0423/1.x
fix sentinel bug and add a new module spring-cloud-alibaba-sentinel-datasource in branch 1.x
|
2018-10-24 17:29:36 +08:00 |
|
fangjian0423
|
8190b0f4a1
|
remove duplicate and put once in datasource registry.
|
2018-10-24 16:54:18 +08:00 |
|
fangjian0423
|
ed7fb738f0
|
Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel in 1.x branch
|
2018-10-24 16:40:08 +08:00 |
|
fangjian0423
|
21c5b964f2
|
Merge remote-tracking branch 'upstream/1.x' into 1.x
|
2018-10-24 16:16:36 +08:00 |
|
fangjian0423
|
b374a291be
|
Add rules automation
|
2018-10-24 16:08:15 +08:00 |
|
Spencer Gibb
|
ca3f02c281
|
Adds spring profile to circleci
|
2018-10-23 16:21:15 -04:00 |
|
Spencer Gibb
|
fe716483ad
|
Adds circleci support
|
2018-10-23 16:16:44 -04:00 |
|
Spencer Gibb
|
79b41ceaa6
|
Updates to snapshot versions
|
2018-10-23 15:01:13 -04:00 |
|
format
|
6243fa9400
|
Merge pull request #54 from flystar32/1.x
update nacos version to 0.3.0-RC1
|
2018-10-23 14:06:19 +08:00 |
|
flystar32
|
b434af4455
|
separate namingservice from nacosregistration and discoveryclient
|
2018-10-22 20:10:41 +08:00 |
|
flystar32
|
cf5d407e85
|
update nacos version to 0.3.0-RC1
|
2018-10-22 19:00:34 +08:00 |
|
format
|
b67c39e643
|
Merge pull request #46 from flystar32/1.x
separate registry and discovery, Fixes #42
|
2018-10-19 20:52:18 +08:00 |
|
亦盏
|
27ddaa68a8
|
separate registry and discovery
|
2018-10-17 12:35:42 +08:00 |
|
format
|
0f444a40ab
|
Merge pull request #45 from flystar32/1.x
add management info to registry metadata, Fixes #41
|
2018-10-17 10:36:33 +08:00 |
|
fangjian0423
|
41db9c945b
|
update comments and docs
|
2018-10-16 16:51:31 +08:00 |
|
亦盏
|
7449073841
|
add management info to registry metadata
|
2018-10-16 16:51:29 +08:00 |
|
fangjian0423
|
65f380c064
|
update sentinel examples and metadata info to support new configurations of sentinel
|
2018-10-11 23:09:54 +08:00 |
|
fangjian0423
|
e0382d9876
|
sentinel support more properties in springboot 1.x
|
2018-10-11 22:14:21 +08:00 |
|