Spencer Gibb f1bd9bdfaa Merge branch 'polish' of https://github.com/philwebb/spring-cloud-netflix into philwebb-polish ...

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

2015-01-15 11:04:47 -07:00

..

src

Merge branch 'polish' of https://github.com/philwebb/spring-cloud-netflix into philwebb-polish

2015-01-15 11:04:47 -07:00

pom.xml

Add eclipse formatting and cleanup configuration

2015-01-14 13:09:14 -08:00

run-server.sh

added simple python http server as a test non-jvm app

2014-11-25 16:46:10 -07:00