-
Merge branch 'polish' of https://github.com/philwebb/spring-cloud-netflix into philwebb-polish · f1bd9bdfSpencer Gibb authored
Conflicts: spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientScan.java spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java spring-cloud-netflix-turbine-amqp/src/test/java/org/springframework/cloud/netflix/turbine/amqp/AggregatorTest.java
f1bd9bdf
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| src | Loading commit data... | |
| pom.xml | Loading commit data... | |
| run-server.sh | Loading commit data... |