Spring/spring-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-581 - Fix possible test failure(s) in GenericRegionFactoryBeanTest.

Browse Source 
(cherry picked from commit 4da08b04fddaa64b4b79762edd53d867987bcb9a)
Signed-off-by: John Blum <jblum@pivotal.io>
This commit is contained in:
John Blum
2017-01-03 16:47:02 -08:00
parent a6926c40e4
commit fb53e13858
5 changed files with 179 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/springframework/data/gemfire/support/AnnotationBasedExpiration.java
View File

@@ -60,18 +60,10 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.data.gemfire.support.Expiration
* @see org.springframework.data.gemfire.support.IdleTimeoutExpiration
* @see org.springframework.data.gemfire.support.TimeToLiveExpiration
<<<<<<< HEAD
* @see org.apache.geode.cache.CustomExpiry
* @see org.apache.geode.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAttributes
* @see org.apache.geode.cache.Region
=======
* @see org.apache.geode.cache.CustomExpiry
* @see org.apache.geode.cache.ExpirationAction
* @see org.apache.geode.cache.ExpirationAttributes
* @see org.apache.geode.cache.Region
* @see <a href="http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#bootstrap:region:expiration:annotation">Annotation-based Data Expiration</a>
>>>>>>> bfb3347... SGF-516 - Configure Expiration with annotations.
* @since 1.7.0
*/
@SuppressWarnings("unused")