Merge branch '1.2.x'

This commit is contained in:
Phillip Webb
2015-09-08 14:37:16 -07:00
94 changed files with 446 additions and 203 deletions

View File

@@ -33,8 +33,7 @@ import org.springframework.boot.configurationprocessor.fieldvalues.javac.JavaCom
public interface FieldValuesParser {
/**
* Implementation of {@link FieldValuesParser} that always returns an empty
* result.
* Implementation of {@link FieldValuesParser} that always returns an empty result.
*/
FieldValuesParser NONE = new FieldValuesParser() {