Spencer Gibb 78511e19b4 Merge branch 'master' into 2.0.x ...

# Conflicts:
#	spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/health/DiscoveryCompositeHealthIndicatorTests.java

2017-06-29 16:16:32 -06:00

..

src/main

Allow Discovery HealthIndicator description to be disabled.

2017-06-29 16:15:09 -06:00

pom.xml

Going back to snapshots

2017-06-16 14:54:23 -06:00