SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding back in search strategy as we now have a failure analyzer for this condition. Fixes #1193

Browse Source
This commit is contained in:
Ryan Baxter
2018-11-20 12:13:10 -05:00
parent c476c9c4c0
commit 98d84a369d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/config/EnvironmentRepositoryConfiguration.java
View File

@@ -191,7 +191,7 @@ public class EnvironmentRepositoryConfiguration {
}
@Configuration
@ConditionalOnMissingBean(value = EnvironmentRepository.class)//, search = SearchStrategy.CURRENT)
@ConditionalOnMissingBean(value = EnvironmentRepository.class, search = SearchStrategy.CURRENT)
class DefaultRepositoryConfiguration {
@Autowired
private ConfigurableEnvironment environment;

3
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeBootstrapFailureAnalyzerTests.java
View File

@@ -18,8 +18,7 @@ public class NativeBootstrapFailureAnalyzerTests {
@Rule
public OutputCapture outputCapture = new OutputCapture();
@Ignore
@Test
public void contextLoads(){
try {