Commit Graph

89 Commits (03309b8481afcc827832ddaf80cdf36af57324a6)

Author SHA1 Message Date
fangjian0423 53c4a6adf6 refactor & upgrade rocketmq-client version 6 years ago
fangjian0423 474132db42 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
flystar32 b50cd9266f update nacos and fescar version and format some testcase 6 years ago
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
gaokai eef764a020 删除重复属性 6 years ago
fangjian0423 83d0220c73 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
fangjian0423 e537eb55de resolve conflict 6 years ago
Xiaolong Zuo e8aaa3e948
Merge pull request #373 from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul
Feature spring cloud alibaba sentinel zuul
6 years ago
pbting 92519a7a09
Merge branch 'master' into master 6 years ago
得少 3934115863 1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
6 years ago
mercyblitz 0337f0fa6c Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 6 years ago
mercyblitz 47733ea41f Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 6 years ago
tiger ac25e4a9dc add sentinel-zuul-adapter dependency 6 years ago
mercyblitz 969dece586 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
6 years ago
mercyblitz 2fdeeec3ff Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
6 years ago
fangjian0423 ca249d213e upgrade sentinel version to 1.4.2 6 years ago
fangjian0423 1dc80d7a6f Updates to spring cloud greenwich 6 years ago
format 9b84df9015
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
6 years ago
mercyblitz fc8d8e3628 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 6 years ago
gaoyunpeng 394485a12d replace cobertura to jacoco 6 years ago
得少 997faff710 add nacos discovery starter support to connect to aliyun 6 years ago
fangjian0423 62ad2836a1 Polish #259 6 years ago
mercyblitz ff6e68d522 Update Dubbo Spring Boot 0.2.1.RELEASE 6 years ago
mercyblitz a5e950186f Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
#	spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
#	spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
6 years ago
flystar32 30b6456558 resolve conflict 6 years ago
flystar32 a6a894a110 add module Fescar, Polish #303 6 years ago
flystar32 990bf1bff7 update nacos version to 0.8.0 ,Polish #295, #317 6 years ago
mercyblitz 744e33229a Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
6 years ago
mercyblitz 59a969049d Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
6 years ago
chenzhu.zxl 2de5362f4d Fix SchedulerX cycle ref error. 6 years ago
fangjian0423 b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization 6 years ago
gaoyunpeng 20eb325e59 update cobertura settings for reduce build time 6 years ago
mercyblitz 571d0eca15 Polish spring-cloud-incubator/spring-cloud-alibaba#262 6 years ago
得少 ee2c696bdf ans starter suport eureka/consule registry and add sms module 6 years ago
xiaolongzuo a756948248 Upgrade alicloud-context version. 6 years ago
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT 6 years ago
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE 6 years ago
flystar32 b6a7bf0ee6 update nacos version 6 years ago
pengbingting 92f728176a sentinel support custom block response by sentinelClientHttpResponse 6 years ago
flystar32 4a1cd617e2 update nacos and alicloud-context version 6 years ago
fangjian0423 564acbb2a8 upgrade sentinel version to 1.4.0 6 years ago
flystar32 51b0766f11 update ans version to 1.0.1 6 years ago
flystar32 772fdf707f update schedulerx version 6 years ago
chenzhu.zxl 4bf7c9c7c4 Add Sonatype Repository to AliCloud Context. 6 years ago
chenzhu.zxl a4e4192d33 Force update Sonatype Repository snapshots. 6 years ago
chenzhu.zxl 7cf8fcefc0 Add Sonatype Repository. 6 years ago
chenzhu.zxl 4fbc01405a Fix compile error. 6 years ago
chenzhu.zxl 120cb4f096 Fix compile error. 6 years ago
chenzhu.zxl f1bd3fd2c2 Add SchedulerX modules. 6 years ago
chenzhu.zxl 2bcdbb0eb5 Fix schedulerx version error. 6 years ago