Merge branch '1.5.x' into 2.0.x

2019-06-28 12:19:46 -07:00
parent 256a0d636d 6d01bc915b
commit bb34846630
4 changed files with 6 additions and 5 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
@@ -40,7 +40,7 @@ import org.springframework.util.MultiValueMap;
 * Abstract base class for nested conditions.
 *
 * @author Phillip Webb
- * @since 2.0.1
+ * @since 1.5.22
 */
 public abstract class AbstractNestedCondition extends SpringBootCondition implements ConfigurationCondition {