Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll
2016-11-30 15:19:34 +01:00

View File

@@ -78,7 +78,7 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
setMatchDefault(false);
setDocumentMatchers(new SpringProfileDocumentMatcher(profile));
}
setResources(new Resource[] { resource });
setResources(resource);
}
@Override