SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1876 from ryanjbaxter/upgrade-hystrix-1.5.11

Browse Source 
Upgrade Hystrix to 1.5.11 and apply fix to hystrixcommand.js
This commit is contained in:
Ryan Baxter
2017-04-20 16:30:09 -04:00
committed by GitHub
parent a708ceefe8 17f43fd138
commit 1647fc3017
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-netflix-dependencies/pom.xml
View File

@@ -17,7 +17,7 @@
<archaius.version>0.7.4</archaius.version>
<eureka.version>1.6.2</eureka.version>
<feign.version>9.4.0</feign.version>
<hystrix.version>1.5.10</hystrix.version>
<hystrix.version>1.5.11</hystrix.version>
<ribbon.version>2.2.2</ribbon.version>
<servo.version>0.10.1</servo.version>
<zuul.version>1.3.0</zuul.version>

3
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.js
View File

@@ -175,6 +175,7 @@
assertNotNull(data,"propertyValue_circuitBreakerSleepWindowInMilliseconds");
assertNotNull(data,"propertyValue_circuitBreakerErrorThresholdPercentage");
assertNotNull(data,"propertyValue_circuitBreakerForceOpen");
assertNotNull(data,"propertyValue_circuitBreakerForceClosed");
assertNotNull(data,"propertyValue_executionIsolationStrategy");
assertNotNull(data,"propertyValue_executionIsolationThreadTimeoutInMilliseconds");
assertNotNull(data,"propertyValue_executionIsolationThreadInterruptOnTimeout");
@@ -539,5 +540,3 @@
return x1 + x2;
}
})(window);