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	BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2	2019-04-08 16:54:53 +02:00
.gitignore	BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2	2019-04-08 16:54:53 +02:00
Dockerfile	BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2	2019-04-08 16:54:53 +02:00
client-config.yaml	BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2	2019-04-08 16:54:53 +02:00
client-service-deployment.yaml	BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2	2019-04-08 16:54:53 +02:00
pom.xml	Merge branch 'master' into BAEL-2460	2019-04-09 20:43:32 +02:00