Skip to content

S
spring-boot
Commit 68582bba authored by Dave Syer's avatar Dave Syer
Browse files
Options

Merge branch '1.1.x'

parents 67ba66dc 6c5f8f95
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/EnableAutoConfiguration.java
View file @ 68582bba
...@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure; ...@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
...@@ -66,6 +67,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader; ...@@ -66,6 +67,7 @@ import org.springframework.core.io.support.SpringFactoriesLoader;
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
@Inherited
@Import({ EnableAutoConfigurationImportSelector.class, @Import({ EnableAutoConfigurationImportSelector.class,
AutoConfigurationPackages.Registrar.class }) AutoConfigurationPackages.Registrar.class })
public @interface EnableAutoConfiguration { public @interface EnableAutoConfiguration {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment