Stephane Nicoll 05fbd5dc46 Merge branch '1.5.x'

2017-06-06 16:04:29 +02:00

..

main

Merge branch '1.5.x'

2017-06-06 16:04:29 +02:00

test/java/org/springframework/boot

Fix datasource example

2017-05-15 00:35:08 +03:00