Merge branch '1.5.x'

This commit is contained in:
Phillip Webb
2016-10-03 22:47:11 -07:00
44 changed files with 803 additions and 718 deletions

View File

@@ -19,8 +19,7 @@ package org.springframework.boot.configurationsample.specific;
import org.springframework.boot.configurationsample.ConfigurationProperties;
/**
* Test that compilation fails if the same type is registered twice with the
* same prefix.
* Test that compilation fails if the same type is registered twice with the same prefix.
*
* @author Stephane Nicoll
*/