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

Merge branch '2.0.x'

This commit is contained in:
Madhura Bhave 2018-07-26 12:36:40 -07:00
parent 6fe366bd64 c775ff8f60
commit db1d3fa282
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnProperty.java
View File

@ -22,7 +22,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.autoconfigure.couchbase.OnBootstrapHostsCondition;
import org.springframework.context.annotation.Conditional;
import org.springframework.core.env.Environment;
@ -85,7 +84,6 @@ import org.springframework.core.env.Environment;
* </pre>
*
* It is better to use a custom condition for such cases.
* See {@link OnBootstrapHostsCondition} for an example of a custom condition.
*
* @author Maciej Walkowiak
* @author Stephane Nicoll