From 6425862477e96d867854504f6503cfe6ec05aded Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 5 Sep 2014 12:39:57 +0100 Subject: [PATCH] Make @EnableZuulProxy switch on Hystrix --- .../org/springframework/cloud/netflix/zuul/EnableZuulProxy.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java index fecce76f..5e4a3dc8 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/EnableZuulProxy.java @@ -4,10 +4,12 @@ import java.lang.annotation.*; import org.springframework.context.annotation.Import; import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.netflix.hystrix.EnableHystrix; /** * @author Spencer Gibb */ +@EnableHystrix @EnableEurekaClient @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME)