Merge branch 'pr/630-hystrix-christian'

Conflicts: pom.xml
2016-08-26 09:10:20 +02:00
parent 6ca37e314a 5b4c8129c7
commit 03f1602d1b
16 changed files with 399 additions and 1 deletions
@@ -87,7 +87,7 @@
        <module>spring-rest-angular</module>
        <module>spring-rest-docs</module>
        <module>spring-cloud-config</module>
-        <module>spring-cloud-eureka</module>
+        <module>spring-cloud-hystrix</module>

        <module>spring-security-basic-auth</module>
        <module>spring-security-custom-permission</module>