caroline a93088bca6 Merge branch 'master' into BAEL-2460 ... # Conflicts: # spring-cloud/spring-cloud-kubernetes-2/pom.xml		2019-04-09 20:43:32 +02:00
..
src	…
.gitignore	…
Dockerfile	…
client-config.yaml	…
client-service-deployment.yaml	…
pom.xml	Merge branch 'master' into BAEL-2460	2019-04-09 20:43:32 +02:00