Josh Cummings 0be2175c89 Merge branch 'master' into bael-16656		2019-10-26 15:37:05 -06:00
..
book-service.properties	Merge branch 'master' into bael-16656	2019-10-26 15:37:05 -06:00
discovery.properties	Merge branch 'master' into bael-16656	2019-10-26 15:37:05 -06:00
gateway.properties	Merge branch 'master' into bael-16656	2019-10-26 15:37:05 -06:00
rating-service.properties	Merge branch 'master' into bael-16656	2019-10-26 15:37:05 -06:00
zipkin.properties	Merge branch 'master' into bael-16656	2019-10-26 15:37:05 -06:00