spring-cloud-netflix-eureka-client/src/test/java/org/springframework · 5a337fd6c1cc8f0e0cba166a15f7101eedb09aec · openSource / spring-cloud-netflix

Merge branch 'master' into 2.0.x · 71bd19d5

authored Oct 18, 2017

# Conflicts:
#	spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamTests.java
#	spring-cloud-netflix-zuul/src/main/java/org/springframework/cloud/netflix/zuul/ZuulProxyAutoConfiguration.java

71bd19d5

Name	Last commit	Last update
..
cloud/netflix		Loading commit data...