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 '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-07-21 15:36:27 +01:00
parent 20577657ee c70cc55db8
commit 18cfd9d3dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ import org.springframework.context.annotation.Conditional;
/**
* {@link Conditional} that only matches when the specified bean classes and/or names are
* already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
* the bean class default to the return type of the factory method:
* the bean class defaults to the return type of the factory method:
*
* <pre class="code">
* &#064;Configuration

4
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java
View File

@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
* {@link Conditional} that only matches when the specified bean classes and/or names are
* not already contained in the {@link BeanFactory}.
* <p>
* When placed on a {@code @Bean} method, the bean class default to the return type of the
* factory method:
* When placed on a {@code @Bean} method, the bean class defaults to the return type of
* the factory method:
*
* <pre class="code">
* &#064;Configuration