spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-03 15:59:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-11-30 15:19:34 +01:00
parent da6360e506 2a059e732e
commit 464a54ce04
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
Vendored Regular → Executable
+1 -1
View File
@@ -78,7 +78,7 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
setMatchDefault(false);
setDocumentMatchers(new SpringProfileDocumentMatcher(profile));
}
setResources(new Resource[] { resource });
setResources(resource);
}
@Override