Merge branch 'master' into 3.0.0

redisson-hibernate/README.md

@@ -2,7 +2,7 @@ Redis based Hibernate Cache implementation
 ===
 
 Implements Hibernate 2nd level Cache provider based on Redisson.  
-Supports all Hibernate cache strategies: `READ_ONLY`, `NONSTRICT_READ_WRITE`, `READ_WRITE` and `TRANSACTIONAL`.
+Supports all Hibernate cache strategies: `READ_ONLY`, `NONSTRICT_READ_WRITE`, `READ_WRITE` and `TRANSACTIONAL`.  
 It's recommended to use FST or Snappy as [codec](https://github.com/redisson/redisson/wiki/4.-data-serialization).
 
 Compatible with Hibernate 4.x, 5.x
@@ -102,7 +102,7 @@ Usage
 <property name="hibernate.cache.redisson.config" value="/redisson.json" />
 ```
 
-Redisson allows to define follow cache settings per entity, collection, naturalid, query and timestamp regions:  
+#### Redisson allows to define follow cache settings per entity, collection, naturalid, query and timestamp regions:  
 
 `hibernate.cache.redisson.[REGION_NAME].eviction.max_entries` - max size of cache. Superfluous entries in Redis are evicted using LRU algorithm. `0` value means unbounded cache. Default value: 0  
 
@@ -134,7 +134,7 @@ Default value: NONE
 
 _Please note: `*.localcache.*` settings are available for `RedissonClusteredLocalCachedRegionFactory` and `RedissonLocalCachedRegionFactory` classes only._
 
-Default region configuration used for all caches not specified in configuration:
+#### Default region configuration used for all caches not specified in configuration:
 
 ```xml
 <!-- cache definition applied to all caches in entity region -->
@@ -198,7 +198,7 @@ Default region configuration used for all caches not specified in configuration:
 <property name="hibernate.cache.redisson.timestamps.localcache.size" value="5000" />
 ```
 
-Configuration per entity/collection/naturalid/query region overrides default configuration:
+#### Configuration per entity/collection/naturalid/query region overrides default configuration:
 
 ```xml
 <!-- cache definition for entity region. Example region name: "my_object" -->

redisson-spring-boot-starter/README.md

@@ -3,7 +3,7 @@ Spring Boot Starter
 
 Integrates Redisson with Spring Boot library. Depends on [Spring Data Redis](https://github.com/redisson/redisson/tree/master/redisson-spring-data#spring-data-redis-integration) module.
 
-Supports Spring Boot 1.3.x, 1.4.x, 1.5.x, 2.0.x
+Supports Spring Boot 1.3.x, 1.4.x, 1.5.x, 2.0.x, 2.1.x
 
 <sub>Please consider __[Redisson PRO](https://redisson.pro)__ version for advanced features and support by SLA.</sub>
 

redisson-spring-data/README.md

@@ -1,9 +1,9 @@
 Spring Data Redis integration
 ===
 
-Integrates Redisson with Spring Data Redis library. Provides ability to work with Redis through `RedisTemplate` object.
+Integrates Redisson with Spring Data Redis library. Implements Spring Data's `RedisConnection` and `RedisClusterConnection` interfaces, so you could work with Redis through `RedisTemplate` object.
 
-Supports Spring Data Redis 1.6.x, 1.7.x, 1.8.x, 2.0.x
+Supports Spring Data Redis 1.6.x, 1.7.x, 1.8.x, 2.0.x, 2.1.x
 
 <sub>Please consider __[Redisson PRO](https://redisson.pro)__ version for advanced features and support by SLA.</sub>
 
@@ -26,6 +26,8 @@ Usage
          <artifactId>redisson-spring-data-18</artifactId>
          <!-- for Spring Data Redis v.2.0.x -->
          <artifactId>redisson-spring-data-20</artifactId>
+         <!-- for Spring Data Redis v.2.1.x -->
+         <artifactId>redisson-spring-data-21</artifactId>
          <version>3.9.1</version>
      </dependency>
      ```
@@ -40,6 +42,8 @@ Usage
      compile 'org.redisson:redisson-spring-data-18:3.9.1'
      // for Spring Data Redis v.2.0.x
      compile 'org.redisson:redisson-spring-data-20:3.9.1'
+     // for Spring Data Redis v.2.1.x
+     compile 'org.redisson:redisson-spring-data-21:3.9.1'
      ```  
 
 2. __For JDK 1.6+__  
@@ -54,8 +58,6 @@ Usage
          <artifactId>redisson-spring-data-17</artifactId>
          <!-- for Spring Data Redis v.1.8.x -->
          <artifactId>redisson-spring-data-18</artifactId>
-         <!-- for Spring Data Redis v.2.0.x -->
-         <artifactId>redisson-spring-data-20</artifactId>
          <version>2.14.1</version>
      </dependency>
      ```
@@ -68,8 +70,6 @@ Usage
      compile 'org.redisson:redisson-spring-data-17:2.14.1'
      // for Spring Data Redis v.1.8.x
      compile 'org.redisson:redisson-spring-data-18:2.14.1'
-     // for Spring Data Redis v.2.0.x
-     compile 'org.redisson:redisson-spring-data-20:2.14.1'
      ```