mirror of
https://github.com/spring-cloud/spring-cloud-netflix.git
synced 2026-09-17 15:49:00 +00:00
Olga Maciaszek-Sharma
eef49656e0
# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-netflix-archaius/pom.xml # spring-cloud-netflix-concurrency-limits/pom.xml # spring-cloud-netflix-core/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-netflix-hystrix-contract/pom.xml # spring-cloud-netflix-hystrix-dashboard/pom.xml # spring-cloud-netflix-hystrix-stream/pom.xml # spring-cloud-netflix-hystrix/pom.xml # spring-cloud-netflix-ribbon/pom.xml # spring-cloud-netflix-sidecar/pom.xml # spring-cloud-netflix-turbine-stream/pom.xml # spring-cloud-netflix-turbine/pom.xml # spring-cloud-netflix-zuul/pom.xml # spring-cloud-starter-netflix-eureka-client/pom.xml # spring-cloud-starter-netflix-eureka-server/pom.xml # spring-cloud-starter-netflix/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-archaius/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix-dashboard/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-hystrix/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-ribbon/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine-stream/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-turbine/pom.xml # spring-cloud-starter-netflix/spring-cloud-starter-netflix-zuul/pom.xml