From 2d748bf63c785a034f2cd80cb81184b7a050c4cb Mon Sep 17 00:00:00 2001 From: Bertrand Renuart Date: Wed, 16 Nov 2016 17:39:48 +0100 Subject: [PATCH] use different bean names for Hystrix and HystrixStream features (#1470) Fixes gh-1462 --- .../netflix/hystrix/HystrixCircuitBreakerConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java index f23e5282..8be0d8c6 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java @@ -82,7 +82,7 @@ public class HystrixCircuitBreakerConfiguration { } @Bean - public HasFeatures hystrixFeature() { + public HasFeatures hystrixStreamFeature() { return HasFeatures.namedFeature("Hystrix Stream Servlet", HystrixStreamEndpoint.class); } }