Commit Graph

85 Commits (2c98073532e2e9aadd17b3fa431ed54c015a9dd0)

Author SHA1 Message Date
Nikita Koksharov c4b1ebdee9 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-hibernate/pom.xml
#	redisson-hibernate/redisson-hibernate-4/pom.xml
#	redisson-hibernate/redisson-hibernate-5/pom.xml
#	redisson-hibernate/redisson-hibernate-52/pom.xml
#	redisson-hibernate/redisson-hibernate-53/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
6 years ago
Nikita Koksharov 5c06df9510
Update README.md 6 years ago
Nikita Koksharov d4ac1cdc05 [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 8210c58b33 [maven-release-plugin] prepare release redisson-3.10.2 6 years ago
Nikita Koksharov 00d268b91f [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 7b05535438 [maven-release-plugin] prepare release redisson-2.15.2 6 years ago
Nikita Koksharov f81467fa45 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-hibernate/pom.xml
#	redisson-hibernate/redisson-hibernate-4/pom.xml
#	redisson-hibernate/redisson-hibernate-5/pom.xml
#	redisson-hibernate/redisson-hibernate-52/pom.xml
#	redisson-hibernate/redisson-hibernate-53/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/reactive/ReactiveProxyBuilder.java
6 years ago
Nikita Koksharov 25730b7c69
Update README.md 6 years ago
Nikita Koksharov f726ff0eb0 [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 75ba6f2b81 [maven-release-plugin] prepare release redisson-3.10.1 6 years ago
Nikita Koksharov 3661431674 [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov d2199e2508 [maven-release-plugin] prepare release redisson-2.15.1 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 9d3d4a8562 License header updated 6 years ago
Nikita Koksharov d940781561 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-hibernate/pom.xml
#	redisson-hibernate/redisson-hibernate-4/pom.xml
#	redisson-hibernate/redisson-hibernate-5/pom.xml
#	redisson-hibernate/redisson-hibernate-52/pom.xml
#	redisson-hibernate/redisson-hibernate-53/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
6 years ago
Nikita Koksharov 82baf9a75f
Update README.md 6 years ago
Nikita Koksharov 0d2e50afda
Update README.md 6 years ago
Nikita Koksharov 4faf81b06f [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 9c08df833c [maven-release-plugin] prepare release redisson-3.10.0 6 years ago
Nikita Koksharov 4c897ea4ef [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov ace29bd74b [maven-release-plugin] prepare release redisson-2.15.0 6 years ago
Nikita Koksharov 52f476a398 Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/api/RMapReactive.java
#	redisson/src/main/java/org/redisson/api/RSetCacheReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonSetReactive.java
6 years ago
Nikita Koksharov 800d650341
Update README.md 6 years ago
Nikita Koksharov bf71a04ae8 versions updated 6 years ago
Nikita Koksharov 2c2756e3e3 Merge branch 'master' into 3.0.0 6 years ago
Nikita Koksharov f1526a93fd Fixed - Redisson Spring Boot doesn't start properly without lettuce or jedis in classpath #1774 6 years ago
Nikita Koksharov 7be83688d3 Merge branch 'master' into 3.0.0 6 years ago
Nikita Koksharov 90c76f3538 poms updated 6 years ago
Nikita Koksharov 033109b8a0
Update README.md 6 years ago
Nikita Koksharov 46bb791928 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
6 years ago
Nikita Koksharov 993e3b4406
Update README.md 6 years ago
Nikita Koksharov 178dd16acc [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 054f2c5088 [maven-release-plugin] prepare release redisson-3.9.1 6 years ago
Nikita Koksharov e81139d047 [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov ae049c26ea [maven-release-plugin] prepare release redisson-2.14.1 6 years ago
Nikita Koksharov 196f782029 Merge branch 'master' into 3.0.0 6 years ago
Nikita Koksharov 9a44460e61
Update README.md 6 years ago
Nikita Koksharov 718cef677c Merge branch 'master' into 3.0.0 6 years ago
Nikita Koksharov 82050c404a Fixed - Spring Boot Starter doesn't convert properly list of sentinel addresses. #1731 6 years ago
junwu215177 39eba7f314 in case timeoutValue is null 6 years ago
Nikita Koksharov b319527469 [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov cea54ec296 [maven-release-plugin] prepare release redisson-3.9.0 6 years ago
Nikita Koksharov 2a08edf2ff [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita Koksharov 20dd4ad428 [maven-release-plugin] prepare release redisson-2.14.0 6 years ago
Nikita Koksharov dca458f65b Merge branch 'master' into 3.0.0 6 years ago
Nikita Koksharov 57e2d6253a Fixed - "spring.redis.cluster.nodes" param parsing for spring-boot 6 years ago
Nikita 13a50d23d0 Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/pom.xml
#	redisson-spring-boot-starter/pom.xml
#	redisson-spring-data/pom.xml
#	redisson-spring-data/redisson-spring-data-16/pom.xml
#	redisson-spring-data/redisson-spring-data-17/pom.xml
#	redisson-spring-data/redisson-spring-data-18/pom.xml
#	redisson-spring-data/redisson-spring-data-20/pom.xml
#	redisson-tomcat/pom.xml
#	redisson-tomcat/redisson-tomcat-6/pom.xml
#	redisson-tomcat/redisson-tomcat-7/pom.xml
#	redisson-tomcat/redisson-tomcat-8/pom.xml
#	redisson-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/command/CommandReactiveExecutor.java
#	redisson/src/main/java/org/redisson/command/CommandReactiveService.java
#	redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonExpirableReactive.java
#	redisson/src/main/java/org/redisson/reactive/RedissonObjectReactive.java
6 years ago
Nikita Koksharov 44d030cf0d
Update README.md 6 years ago
Nikita f925b484dc [maven-release-plugin] prepare for next development iteration 6 years ago
Nikita 6e46a51bd1 [maven-release-plugin] prepare release redisson-3.8.2 6 years ago