From 89b53cfcd509bd5cf782ff65a82dc1ad1dae1e4a Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@gopivotal.com>
Date: Tue, 27 Aug 2013 10:48:38 -0700
Subject: [PATCH] Javadoc that @Conditionals are not inherited

Issue: SPR-10840
---
 .../org/springframework/context/annotation/Conditional.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
index 898e3ebcd3..9c1509f6db 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
@@ -41,6 +41,9 @@ import java.lang.annotation.Target;
  * {@code @Bean} methods and {@link Import @Import} annotations associated with that class
  * will be subject to the conditions.
  *
+ * <p>NOTE: {@code @Conditional} annotations are not inherited, any conditions from
+ * super-classes or from overridden methods are not considered.
+ *
  * @author Phillip Webb
  * @since 4.0
  * @see Condition