root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.1.x'

This commit is contained in:
Andy Wilkinson 2014-09-22 09:27:13 +01:00
parent c2e588a37c 5c84e17d10
commit 944045cd34
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementSecurityAutoConfiguration.java
View File

@ -167,6 +167,7 @@ public class ManagementSecurityAutoConfiguration {
@Configuration @Configuration
@ConditionalOnExpression("${management.security.enabled:true} && !${security.basic.enabled:true}") @ConditionalOnExpression("${management.security.enabled:true} && !${security.basic.enabled:true}")
@ConditionalOnMissingBean(WebSecurityConfiguration.class) @ConditionalOnMissingBean(WebSecurityConfiguration.class)
@ConditionalOnWebApplication
@EnableWebSecurity @EnableWebSecurity
protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration { protected static class WebSecurityEnabler extends AuthenticationManagerConfiguration {
} }