study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity
Spring-Cloud-Alibaba/spring-cloud-alibaba-sentinel
History
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
2019-02-01 22:08:21 +08:00
..
src
Merge remote-tracking branch 'upstream/master'
2019-02-01 22:08:21 +08:00
pom.xml
fix #294 EnableCircuitBreaker error
2019-01-18 19:11:53 +08:00