Commit Graph

167 Commits (47505aa3f32454c8088a91762bc39d92cc2097eb)

Author SHA1 Message Date
Nikita ff59a1420a Merge branch 'master' into 3.0.0
# Conflicts:
#	pom.xml
#	redisson-all/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/pom.xml
7 years ago
Nikita c042ae900e Javadocs generation fixed 7 years ago
Nikita fabf9c3067 netty updated 7 years ago
Nikita f47de9b9ba [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita d15dbdad88 [maven-release-plugin] prepare release redisson-3.5.7 7 years ago
Nikita 82fc18bb92 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 024205bf3a [maven-release-plugin] prepare release redisson-2.10.7 7 years ago
Nikita 590e2c737f [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 57884dd8fa [maven-release-plugin] prepare release redisson-3.5.6 7 years ago
Nikita 528506634e [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita c0ca42c9ea [maven-release-plugin] prepare release redisson-2.10.6 7 years ago
Nikita 76c64473b4 Merge branch 'master' into 3.0.0 7 years ago
Nikita 6d39a91a55 netty updated 7 years ago
Nikita 30f0f72804 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 1e640ea04e [maven-release-plugin] prepare release redisson-3.5.5 7 years ago
Nikita d228d47404 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita cbf441b24a [maven-release-plugin] prepare release redisson-2.10.5 7 years ago
Nikita bcc7fb4eba Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/misc/RedissonPromise.java
7 years ago
Nikita eb9e52241d FST codec bundled with redisson-all module 7 years ago
Nikita aafae001c6 Merge branch 'master' into 3.0.0
# Conflicts:
#	redisson/src/main/java/org/redisson/command/CommandReactiveBatchService.java
#	redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
7 years ago
Nikita 79bcea3ba7 netty updated 7 years ago
Nikita e622e8dbf7 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 99827db2f0 [maven-release-plugin] prepare release redisson-3.5.4 7 years ago
Nikita c45fbdebe8 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita f0abd5bf12 [maven-release-plugin] prepare release redisson-2.10.4 7 years ago
Nikita 871a7b188e Merge branch 'master' into 3.0.0 7 years ago
Nikita 65247d52b5 Spring version fixed 7 years ago
Nikita 7f60643fc1 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 8ae18f3544 [maven-release-plugin] prepare release redisson-3.5.3 8 years ago
Nikita b9106619bb [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 827ac452b1 [maven-release-plugin] prepare release redisson-2.10.3 8 years ago
Nikita 17d75c5dad [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 02adb6ec5a [maven-release-plugin] prepare release redisson-3.5.2 8 years ago
Nikita 45236c4b4d [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita e244b8a6c3 [maven-release-plugin] prepare release redisson-2.10.2 8 years ago
Nikita 9bf7f70779 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 5e62b955ab [maven-release-plugin] prepare release redisson-3.5.1 8 years ago
Nikita 7158820fe7 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 61947eb8cd [maven-release-plugin] prepare release redisson-2.10.1 8 years ago
Nikita 26892dc003 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita d56111cd32 [maven-release-plugin] prepare release redisson-3.5.0 8 years ago
Nikita 25468044a6 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 138c14fa5c [maven-release-plugin] prepare release redisson-2.10.0 8 years ago
Nikita c13b1b808d [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 87c6acf88b [maven-release-plugin] prepare release redisson-3.4.4 8 years ago
Nikita 1550bc4785 [maven-release-plugin] prepare for next development iteration 8 years ago
Nikita 894389be2e [maven-release-plugin] prepare release redisson-2.9.4 8 years ago
Nikita 1de086e1c0 Merge branch 'master' into 3.0.0 8 years ago
Nikita c10de37eda libs version updated 8 years ago
Nikita 04bcc969c9 Merge branch 'master' into 3.0.0 8 years ago