Commit Graph

2142 Commits (3cb9c9620322c06643d8e2f9c0aac06c2fdb5bac)
 

Author SHA1 Message Date
Xiaolong Zuo 62402b8834
Detele diamond health check.
xiaojing 6a2b578c7e
Merge pull request from xiaolongzuo/master
closes , closes , closes , closes .
Xiaolong Zuo 5cf6d56393
Delete OSSController.java
Xiaolong Zuo 6779cab2b8
Delete OSSApplication.java
chenzhu.zxl 2f8f0bb28b rename OssApplication and OssController.
chenzhu.zxl 7126a8ce33 closes , closes , closes , closes .
flystar32 591350d7e0 update readme
format 3ccf9b1470
Merge pull request from fangjian0423/master
sentinel add logs to query datasource process.
fangjian0423 1d44d73eba sentinel add logs to query datasource process.
xiaojing 252b33f562
Merge pull request from fangjian0423/master
Polish . Add a new module spring-cloud-alibaba-sentinel-datasource.
flystar32 e00d83ca67 update version of spring-cloud-commons, spring-cloud-build and spring-cloud-dependencied-parent
fangjian0423 00aeb90df2 Updates to snapshot versions
fangjian0423 ff2c390673 Merge remote-tracking branch 'upstream/master'
fangjian0423 1d15cdaee5 Polish . Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel.
Spencer Gibb 4fb7879ec4
Adds spring profile to circleci
Spencer Gibb 2f0f106fa8
Adds circleci support
Spencer Gibb ece4531833
Updates to snapshot versions
format a21343d589
Merge pull request from flystar32/master
update nacos version to 0.3.0-RC1
flystar32 f449986650 separate namingservice from nacosregistration and discoveryclient
亦盏 680a5eef01 update nacos version to 0.3.0-RC1
Neptune 256c9d367c
Merge pull request from spring-cloud-incubator/master
Merge
format 6b7924be89
Merge pull request from flystar32/master
separate registry and discovery, Fixes 
亦盏 47cab99b2c separate registry and discovery
fangjian0423 1ce28f00f3 converter property fix
fangjian0423 7566d69406 Merge remote-tracking branch 'origin/master'
fangjian0423 568da97adf Fixes add rules automation
format 1e8fd6ee16
Merge pull request from flystar32/master
add management info to registry metadata, Fixes 
fangjian0423 4829157c09 update comments and docs
亦盏 c4043b5c12 add management info to registry metadata
flystar32 7fdd8fa3e2 update sentinel version to 0.2.0
format 319f249021
Merge pull request from flystar32/master
Fixes  support fileExtension yaml and yml
亦盏 7aae272318 Fixes support fileExtension yaml and yml
flystar32 52a0c6f9de update version to 0.2.0
mercyblitz 52ced1a956 Polish : Initialize spring-cloud-alibaba-nacos-config-server module
flystar32 8a0c087415 update nacos version to 0.2.1
fangjian0423 8702fe00ae refactor storage module: rename storage to oss
fangjian0423 7c1699dcd8 update sentinel examples and metadata info to support new configurations of sentinel
format 117f4f70c6
Merge pull request from xiejiashuai/featrue/support_more_configuration
Featrue/support more sentinel configuration
xiejiashuai 6794c350ef 优化代码
xiejiashuai 03a64885d4 修改代码风格为eclipse风格
flystar32 b0011bf328 rename alibaba storage to alicloud storage
Neptune 883b7cbcbf
Merge pull request from spring-cloud-incubator/master
Merge
xiejiashuai 156404554e 去除多余的导入包
xiejiashuai c483b2fa2b 优化代码
xiejiashuai 9e5de2eabb add author
flystar32 e42225fbcc update nacos config properties , content-type to file-extension
flystar32 b4ec84c078 update example readme nacos port to 8848
flystar32 e4d9f98313 update nacos version to 0.2.1-RC and format code
xiaojing 2d277e42c1
Merge pull request from liaozan/master
remove unnecessary comment
flystar32 4ae2983c7a update pom.xml, and format code