Spencer Gibb dc12c23596 Merge branch 'sidecar' ...

Conflicts:
	pom.xml
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/discovery/DiscoveryClient.java
	spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

2014-11-25 15:51:51 -07:00

..

src

Merge branch 'sidecar'

2014-11-25 15:51:51 -07:00

pom.xml

change zuul implementation to be controller/handler mapping based.

2014-11-25 15:48:30 -07:00