Spencer Gibb b611e78075 Merge branch 'master' into 2.0.x ...

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-commons-dependencies/pom.xml
#	spring-cloud-commons/pom.xml
#	spring-cloud-context/pom.xml
#	spring-cloud-starter/pom.xml

2017-04-06 21:43:05 -06:00

..

src/main

Adds ServiceRegistry documentation.

2017-04-03 19:15:40 -06:00

pom.xml

Bumping versions to 1.2.1.BUILD-SNAPSHOT after release

2017-04-05 14:19:30 -06:00