From 9e4cad750a64f0bc8e4b728c4d62afd724710f93 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 19 Oct 2015 09:26:37 -0600
Subject: [PATCH] Upgrade hystrix to 1.4.18

fixes gh-600
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ad54351a..d1bfa940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 		<archaius.version>0.6.5</archaius.version>
 		<eureka.version>1.2.5</eureka.version>
 		<feign.version>8.10.0</feign.version>
-		<hystrix.version>1.4.17</hystrix.version>
+		<hystrix.version>1.4.18</hystrix.version>
 		<ribbon.version>2.1.0</ribbon.version>
 		<servo.version>0.9.4</servo.version>
 		<zuul.version>1.1.0-rc.1</zuul.version>