mirror of
https://github.com/spring-cloud/spring-cloud-netflix.git
synced 2026-09-17 15:49:00 +00:00
Merge remote-tracking branch 'origin/4.1.x' into 4.2.x
Signed-off-by: Olga Maciaszek-Sharma <olga.maciaszek-sharma@broadcom.com> # Conflicts: # docs/pom.xml # pom.xml # spring-cloud-netflix-dependencies/pom.xml # spring-cloud-netflix-eureka-client-tls-tests/pom.xml # spring-cloud-netflix-eureka-client/pom.xml # spring-cloud-netflix-eureka-server/pom.xml # spring-cloud-starter-netflix-eureka-client/pom.xml # spring-cloud-starter-netflix-eureka-server/pom.xml
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
require:
|
||||
members: false
|
||||
Reference in New Issue
Block a user