Commit Graph

119 Commits (38719d3c54a6a1db8f446913d22624f243474411)
 

Author SHA1 Message Date
xiaojing 38719d3c54 Merge pull request #88 from HaojunRen/master
fixes #87.
6 years ago
Nepxion d75107d11d fixes #87. 6 years ago
Neptune 328fd9ab74 Merge pull request #5 from spring-cloud-incubator/master
Merge
6 years ago
xiaojing c4749f76de fix typo 6 years ago
Spencer Gibb 38b63d6b34 Update to 0.2.1.BUILD-SNAPSHOT 6 years ago
Spencer Gibb 1a2cb6e49f Update SNAPSHOT to 0.2.0.RELEASE 6 years ago
Spencer Gibb 69eb2b1cb3 Updates to latest spring cloud dependencies 6 years ago
xiaojing 2de0ac88e5 Merge pull request #81 from xiaolongzuo/master
Fix configuration specification
6 years ago
xiaolongzuo 808061518a Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
xiaolongzuo 5e7080f786 Fix configuration specification. 6 years ago
xiaolongzuo 95e49bfea9 Fix configuration specification. 6 years ago
flystar32 b01e322e80 update sentinel version to 1.3.0-GA 6 years ago
xiaojing 4e2e0e1716 Merge pull request #77 from xiaolongzuo/master
Extract acm configuration to bootstrap phase and optimize error message.
6 years ago
xiaolongzuo 9660974f85 Extract acm configuration to bootstrap phase. 6 years ago
flystar32 c0fd7d458a update nacos version to 0.3.0 6 years ago
flystar32 c323c29daf update example configuration 6 years ago
xiaolongzuo dfd6d2d16e optimize spring-cloud-alicloud-context tests. 6 years ago
flystar32 11aedf3a05 update ans pom.xml 6 years ago
xiaolongzuo bc61e50a26 optimize error message. 6 years ago
flystar32 5c9d322b50 fix tests 6 years ago
flystar32 d51dc61a90 fix get active profiles 6 years ago
flystar32 d134759b62 put all nacos config metadata to bootstrap 6 years ago
flystar32 e9b99ba547 update readme of nacos config example 6 years ago
flystar32 45632ed5a2 put all nacos config metadata to bootstrap 6 years ago
xiaojing bd0f7fb497 Merge pull request #72 from xiaolongzuo/master
fixes #71.
6 years ago
chenzhu.zxl 6436d38f82 fixes #71. 6 years ago
flystar32 e13ea1bf31 do some housekeeping 6 years ago
xiaojing e354fa8bd7 Merge pull request #69 from xiaolongzuo/master
Detele diamond health check.
6 years ago
Xiaolong Zuo 7889c43ed9 Detele diamond health check. 6 years ago
xiaojing 46688b5089 Merge pull request #67 from xiaolongzuo/master
closes #63, closes #64, closes #65, closes #66.
6 years ago
Xiaolong Zuo a598c64694 Delete OSSController.java 6 years ago
Xiaolong Zuo 08f317bb78 Delete OSSApplication.java 6 years ago
chenzhu.zxl c6627cf2a4 rename OssApplication and OssController. 6 years ago
chenzhu.zxl b70d7bb300 closes #63, closes #64, closes #65, closes #66. 6 years ago
flystar32 e636e260b8 update readme 6 years ago
format 57182efc73 Merge pull request #59 from fangjian0423/master
sentinel add logs to query datasource process.
6 years ago
fangjian0423 71d9987a39 sentinel add logs to query datasource process. 6 years ago
xiaojing 5882c3055a Merge pull request #55 from fangjian0423/master
Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource.
6 years ago
flystar32 c9c9c77572 update version of spring-cloud-commons, spring-cloud-build and spring-cloud-dependencied-parent 6 years ago
fangjian0423 ca41dc5c66 Updates to snapshot versions 6 years ago
fangjian0423 2a5c933cec Merge remote-tracking branch 'upstream/master' 6 years ago
fangjian0423 d7dcae59d2 Polish #51. Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel. 6 years ago
Spencer Gibb a443d7045a Adds spring profile to circleci 6 years ago
Spencer Gibb f0d91140e4 Adds circleci support 6 years ago
Spencer Gibb 5e4cfd887d Updates to snapshot versions 6 years ago
format 7b41bb03b5 Merge pull request #53 from flystar32/master
update nacos version to 0.3.0-RC1
6 years ago
flystar32 0acc4e1fe3 separate namingservice from nacosregistration and discoveryclient 6 years ago
亦盏 64c6a0b39e update nacos version to 0.3.0-RC1 6 years ago
Neptune 76883914ab Merge pull request #3 from spring-cloud-incubator/master
Merge
6 years ago
format 520bb74f23 Merge pull request #47 from flystar32/master
separate registry and discovery, Fixes #42
6 years ago