Commit Graph

7 Commits (817a03982cc1b35a9febd911848a9c3466b9a678)

Author SHA1 Message Date
Nikita Koksharov 0090b8796d refactoring 6 years ago
Nikita Koksharov bc078124f7 Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/reactive/NettyFuturePublisher.java
#	redisson/src/main/java/org/redisson/spring/cache/RedissonCacheStatisticsProvider.java
6 years ago
Nikita Koksharov caabcc3f6f Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/api/RTopicReactive.java
6 years ago
Nikita Koksharov 92b944973b Feature - Spring Data Redis ReactiveRedisConnectionFactory implementation. #1779 6 years ago
Nikita Koksharov be8cff49b4 Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/reactive/MapReactiveIterator.java
#	redisson/src/main/java/org/redisson/reactive/RedissonMapCacheReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonMapReactive.java
6 years ago
Nikita Koksharov 6f17ee1fa8 Fixed - Redisson shouldn't be shutdown in RedissonConnectionFactory #1736 6 years ago
Nikita Koksharov e4f1272d83 Feature - Spring Data Redis 2.1.x support #1739 6 years ago