Commit Graph

3 Commits

Author SHA1 Message Date
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
caroline ff7f60911a BAEL-2460: Integrating spring-cloud-kubernetes-2 to spring-cloud-kubernetes which now is using parent-boot-2 2019-04-08 17:06:46 +02:00
caroline 88be74cf2d 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