From 4e795ea783b6b926edfe213b1ffb84bd36c1eba2 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 3 Mar 2015 17:23:26 -0700
Subject: [PATCH] upgrade hystrix to 1.4.0

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

diff --git a/pom.xml b/pom.xml
index 341b7a2f..347559a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 		<archaius.version>0.6.5</archaius.version>
 		<eureka.version>1.1.147</eureka.version>
 		<feign.version>7.1.0</feign.version>
-		<hystrix.version>1.4.0-RC6</hystrix.version>
+		<hystrix.version>1.4.0</hystrix.version>
 		<ribbon.version>2.0-RC13</ribbon.version>
 		<zuul.version>1.0.28</zuul.version>
 		<netflix.rxjava.version>0.20.7</netflix.rxjava.version>