Commit Graph

376 Commits (8ace4cedddfb78187bb467c4b815717331f3b822)

Author SHA1 Message Date
Nikita 6dc933d47b 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-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
7 years ago
Nikita f173e00020 netty updated 7 years ago
Nikita f6cb32655f [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 12b326873b [maven-release-plugin] prepare release redisson-3.7.0 7 years ago
Nikita 59ee2a2738 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita f817b8aed9 [maven-release-plugin] prepare release redisson-2.12.0 7 years ago
Nikita 204f482d43 Merge branch 'master' into 3.0.0 7 years ago
Nikita 49b26f5545 netty updated. #1409 7 years ago
Nikita 09c5a6baf3 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-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
#	redisson/src/main/java/org/redisson/RedissonReactive.java
#	redisson/src/main/java/org/redisson/command/CommandReactiveBatchService.java
#	redisson/src/main/java/org/redisson/reactive/RedissonBatchReactive.java
#	redisson/src/test/java/org/redisson/RedissonMapTest.java
7 years ago
Nikita ba43ae3f46 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 068217da78 [maven-release-plugin] prepare release redisson-3.6.5 7 years ago
Nikita fad11d51e2 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 7e0227eb46 [maven-release-plugin] prepare release redisson-2.11.5 7 years ago
Nikita 935d7dddaf netty updated 7 years ago
Nikita 0a4f30d540 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita c4c38de419 [maven-release-plugin] prepare release redisson-3.6.4 7 years ago
Nikita d9e57be29e [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 8a0d083fd9 [maven-release-plugin] prepare release redisson-2.11.4 7 years ago
Nikita 6fd68c41f8 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita bfc56a94f8 [maven-release-plugin] prepare release redisson-3.6.3 7 years ago
Nikita 8b52b76e2b [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita d4f75e511e [maven-release-plugin] prepare release redisson-2.11.3 7 years ago
Nikita 587d39d536 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-tomcat/redisson-tomcat-9/pom.xml
#	redisson/pom.xml
7 years ago
Nikita eca2583143 netty updated 7 years ago
Nikita 3869ba16c7 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 0520d7ac2c [maven-release-plugin] prepare release redisson-3.6.2 7 years ago
Nikita 853f5260fb [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 2a736e8f6d [maven-release-plugin] prepare release redisson-2.11.2 7 years ago
Nikita 970d1c73dd [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita bf2c43dd19 [maven-release-plugin] prepare release redisson-3.6.1 7 years ago
Nikita 7d6f768849 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 7868b30ad2 [maven-release-plugin] prepare release redisson-2.11.1 7 years ago
Nikita cabdec982d Merge branch 'master' into 3.0.0 7 years ago
Johno Crawford 354389f732
Netty 4.1.21 + BOM import. 7 years ago
Nikita b97f5cc8a4 [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 3db173e5de [maven-release-plugin] prepare release redisson-3.6.0 7 years ago
Nikita 7abc90676c [maven-release-plugin] prepare for next development iteration 7 years ago
Nikita 7dcab544ae [maven-release-plugin] prepare release redisson-2.11.0 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 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