1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

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
This commit is contained in:
mercyblitz 2019-02-21 14:53:05 +08:00
parent 2fdeeec3ff
commit 969dece586

View File

@ -405,7 +405,7 @@
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<path>https://repo.spring.io/libs-snapshot-local</path>
<url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@ -416,7 +416,7 @@
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<path>https://repo.spring.io/libs-milestone-local</path>
<url>https://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@ -424,7 +424,7 @@
<repository>
<id>spring-releases</id>
<name>Spring Releases</name>
<path>https://repo.spring.io/release</path>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
@ -434,7 +434,7 @@
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<path>https://repo.spring.io/libs-snapshot-local</path>
<url>https://repo.spring.io/libs-snapshot-local</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
@ -445,7 +445,7 @@
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<path>https://repo.spring.io/libs-milestone-local</path>
<url>https://repo.spring.io/libs-milestone-local</url>
<snapshots>
<enabled>false</enabled>
</snapshots>