Commit Graph

89 Commits (b4b727f4d87ebf5d859e72d681a8732a61b45549)
 

Author SHA1 Message Date
Spencer Gibb b4b727f4d8
Bumps spring cloud netflix to 1.4.6.RELEASE 6 years ago
xiaojing 87099c6851
Merge pull request #80 from xiaolongzuo/1.x
Fix configuration specification
6 years ago
flystar32 f3794ae824 update sentinel version to 1.3.0-GA 6 years ago
xiaolongzuo 1c2c74e186 Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 6 years ago
xiaolongzuo 5353abd199 Fix configuration specification. 6 years ago
xiaolongzuo 8b9b06e4e8 Fix configuration specification. 6 years ago
flystar32 6ed038ec2e fix endpoint 6 years ago
xiaojing f9603bf8f7
Merge pull request #78 from xiaolongzuo/1.x
Extract acm configuration to bootstrap phase.
6 years ago
xiaolongzuo 397d6e063a Extract acm configuration to bootstrap phase.
# Conflicts:
#	spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
6 years ago
xiaolongzuo bc43637872 Extract acm configuration to bootstrap phase.
# Conflicts:
#	spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
6 years ago
xiaojing 0ac96c0c20
Merge pull request #76 from xiaolongzuo/1.x
optimize spring-cloud-alicloud-oss module.
6 years ago
flystar32 3f1e00377e update nacos version to 0.3.0 6 years ago
xiaolongzuo 7594313bea optimize spring-cloud-alicloud-oss module. 6 years ago
xiaojing b88d627543
Merge pull request #75 from xiaolongzuo/1.x
Add spring-cloud-alicloud-context tests.
6 years ago
xiaolongzuo e2bacc4528 Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 6 years ago
xiaolongzuo b91f4a9758 Add spring-cloud-alicloud-context tests. 6 years ago
flystar32 c1d89868b5 update example configuration 6 years ago
flystar32 95913171cd update ans pom.xml 6 years ago
flystar32 ad11b5b96f Adds spring profile to circleci, Adds circleci support 6 years ago
format 255dea2c6b
Merge pull request #74 from flystar32/1.x
add acm and ans module
6 years ago
flystar32 c868ca2fa5 add acm and ans module 6 years ago
xiaojing b702d891d6
Merge pull request #73 from xiaolongzuo/1.x
Optimize spring-cloud-alicloud-context module for branch 1.x
6 years ago
xiaolongzuo c309993fe0 optimize error message. 6 years ago
xiaolongzuo 529926b99d Delete invalid test cases. 6 years ago
flystar32 7b7cb91258 fix tests 6 years ago
xiaolongzuo 1445c0a007 Fix acm settings bug. 6 years ago
flystar32 a2b158d67d put all nacos config metadata to bootstrap 6 years ago
xiaolongzuo b3e22ba73c Fix version error, ignore alicloud-context tests. 6 years ago
xiaojing 43a4f97907
Merge pull request #70 from xiaolongzuo/1.x
Add spring-cloud-alicloud-context module for branch 1.x
6 years ago
chenzhu.zxl 76cb758ca0 Add configuration-processor pom. 6 years ago
chenzhu.zxl 6503f8d2cf Add spring-cloud-alicloud-context module. 6 years ago
format 056d4d9471
Merge pull request #60 from fangjian0423/1.x
sentinel add logs to query datasource process for branch 1.x.
6 years ago
fangjian0423 d924184fec sentinel add logs to query datasource process. 6 years ago
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
6 years ago
fangjian0423 8190b0f4a1 remove duplicate and put once in datasource registry. 6 years ago
fangjian0423 ed7fb738f0 Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel in 1.x branch 6 years ago
fangjian0423 21c5b964f2 Merge remote-tracking branch 'upstream/1.x' into 1.x 6 years ago
fangjian0423 b374a291be Add rules automation 6 years ago
Spencer Gibb ca3f02c281
Adds spring profile to circleci 6 years ago
Spencer Gibb fe716483ad
Adds circleci support 6 years ago
Spencer Gibb 79b41ceaa6
Updates to snapshot versions 6 years ago
format 6243fa9400
Merge pull request #54 from flystar32/1.x
update nacos version to 0.3.0-RC1
6 years ago
flystar32 b434af4455 separate namingservice from nacosregistration and discoveryclient 6 years ago
flystar32 cf5d407e85 update nacos version to 0.3.0-RC1 6 years ago
format b67c39e643
Merge pull request #46 from flystar32/1.x
separate registry and discovery, Fixes #42
6 years ago
亦盏 27ddaa68a8 separate registry and discovery 7 years ago
format 0f444a40ab
Merge pull request #45 from flystar32/1.x
add management info to registry metadata, Fixes #41
7 years ago
fangjian0423 41db9c945b update comments and docs 7 years ago
亦盏 7449073841 add management info to registry metadata 7 years ago
fangjian0423 65f380c064 update sentinel examples and metadata info to support new configurations of sentinel 7 years ago