From aa757592b6fa045da347dda68bc3e7f240712cb1 Mon Sep 17 00:00:00 2001
From: Kristine Jetzke <kristine.jetzke@kreuzwerker.de>
Date: Tue, 20 Nov 2018 22:50:13 +0100
Subject: [PATCH] Upgrade Hystrix to 1.5.18 (#3288)

Hystrix 1.5.11 was re-released as 1.5.18, s. Netflix/Hystrix#1891 and https://github.com/Netflix/Hystrix/releases/tag/v1.5.18

This PR replaces #3281
---
 spring-cloud-netflix-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 5fc4583b1a..ea73e3f118 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -16,7 +16,7 @@
 	<properties>
 		<archaius.version>0.7.6</archaius.version>
 		<eureka.version>1.9.3</eureka.version>
-		<hystrix.version>1.5.12</hystrix.version>
+		<hystrix.version>1.5.18</hystrix.version>
 		<ribbon.version>2.2.5</ribbon.version>
 		<servo.version>0.12.21</servo.version>
 		<zuul.version>1.3.1</zuul.version>