Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
boxleytw committed Apr 25, 2015
2 parents 548be1d + 9402858 commit b4dee3d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ TODO.

## Spring HATEOAS

TODO.
See [`LevelMain`](level/src/main/java/hello/LevelMain.java).

## Netflix Feign

See [`RemoteHello`](local/src/main/java/hello/RemoteHello.java).

## Netflix Hysterix

- Circuit breakers not showing in `/health`, working?
Expand All @@ -57,3 +59,5 @@ TODO.
TODO.

## Swagger

See [`HelloWorldMain`](local/src/main/java/hello/HelloWorldMain.java).

0 comments on commit b4dee3d

Please sign in to comment.