Merging changes from #1338

This commit is contained in:
Ryan Baxter
2016-09-13 08:57:01 -04:00
parent 498e8a1486
commit 027e7fc5c6

View File

@@ -24,7 +24,7 @@
<ribbon.version>2.2.0</ribbon.version>
<servo.version>0.10.1</servo.version>
<zuul.version>1.2.2</zuul.version>
<rxjava.version>1.1.5</rxjava.version>
<rxjava.version>1.1.10</rxjava.version>
<java.version>1.7</java.version>
<turbine.version>1.0.0</turbine.version>
<eureka-jersey.version>1.19.1</eureka-jersey.version>