From 2808162037c7dff06e57dc7150407f3de98bec89 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 1 Mar 2016 15:29:01 -0700
Subject: [PATCH] Upgrade Hystrix to 1.4.24

Upgrade RxJava to 1.1.1

fixes gh-866
---
 spring-cloud-netflix-dependencies/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 486a8a40..aa99ad32 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -20,11 +20,11 @@
 		<archaius.version>0.7.3</archaius.version>
 		<eureka.version>1.4.2</eureka.version>
 		<feign.version>8.14.4</feign.version>
-		<hystrix.version>1.4.23</hystrix.version>
+		<hystrix.version>1.4.24</hystrix.version>
 		<ribbon.version>2.1.0</ribbon.version>
 		<servo.version>0.10.1</servo.version>
 		<zuul.version>1.1.0</zuul.version>
-		<rxjava.version>1.0.14</rxjava.version>
+		<rxjava.version>1.1.1</rxjava.version>
 		<java.version>1.7</java.version>
 		<turbine.version>1.0.0</turbine.version>
 		<cloud-connectors.version>1.1.1.RELEASE</cloud-connectors.version>