Merge branch 'master' of github.com:redisson/redisson
# Conflicts: # redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.javapull/4692/head
commit
ab40499ce4
# Conflicts: # redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedissonConnection.javapull/4692/head