Skip to content

S
spring-cloud-netflix
Commit 1647fc30 by Ryan Baxter Committed by GitHub
Options

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

Upgrade Hystrix to 1.5.11 and apply fix to hystrixcommand.js
parents a708ceef 17f43fd1
Showing with 2 additions and 3 deletions
spring-cloud-netflix-dependencies/pom.xml
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<archaius.version>0.7.4</archaius.version> <archaius.version>0.7.4</archaius.version>
<eureka.version>1.6.2</eureka.version> <eureka.version>1.6.2</eureka.version>
<feign.version>9.4.0</feign.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> <ribbon.version>2.2.2</ribbon.version>
<servo.version>0.10.1</servo.version> <servo.version>0.10.1</servo.version>
<zuul.version>1.3.0</zuul.version> <zuul.version>1.3.0</zuul.version>
......
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/hystrixCommand.js
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
assertNotNull(data,"propertyValue_circuitBreakerSleepWindowInMilliseconds"); assertNotNull(data,"propertyValue_circuitBreakerSleepWindowInMilliseconds");
assertNotNull(data,"propertyValue_circuitBreakerErrorThresholdPercentage"); assertNotNull(data,"propertyValue_circuitBreakerErrorThresholdPercentage");
assertNotNull(data,"propertyValue_circuitBreakerForceOpen"); assertNotNull(data,"propertyValue_circuitBreakerForceOpen");
assertNotNull(data,"propertyValue_circuitBreakerForceClosed");
assertNotNull(data,"propertyValue_executionIsolationStrategy"); assertNotNull(data,"propertyValue_executionIsolationStrategy");
assertNotNull(data,"propertyValue_executionIsolationThreadTimeoutInMilliseconds"); assertNotNull(data,"propertyValue_executionIsolationThreadTimeoutInMilliseconds");
assertNotNull(data,"propertyValue_executionIsolationThreadInterruptOnTimeout"); assertNotNull(data,"propertyValue_executionIsolationThreadInterruptOnTimeout");
...@@ -539,5 +540,3 @@ ...@@ -539,5 +540,3 @@
return x1 + x2; return x1 + x2;
} }
})(window); })(window);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment