From ef5785bfb790a5d85ef17a1ffb205cfee03f3fa5 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 11 Nov 2015 15:55:03 -0700
Subject: [PATCH] Upgrade to Hystrix v1.4.20

fixes gh-635
---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 73fc8858..047b1aec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<archaius.version>0.6.5</archaius.version>
 		<eureka.version>1.3.4</eureka.version>
 		<feign.version>8.11.0</feign.version>
-		<hystrix.version>1.4.18</hystrix.version>
+		<hystrix.version>1.4.20</hystrix.version>
 		<ribbon.version>2.1.0</ribbon.version>
 		<servo.version>0.10.0</servo.version>
 		<zuul.version>1.1.0-rc.1</zuul.version>
@@ -356,6 +356,12 @@
 				<groupId>com.netflix.hystrix</groupId>
 				<artifactId>hystrix-metrics-event-stream</artifactId>
 				<version>${hystrix.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.hystrix</groupId>