Merge branch 'master' into 3.0.0

redisson/src/test/java/org/redisson/RedissonBatchTest.java

@@ -117,7 +117,7 @@ public class RedissonBatchTest extends BaseTest {
         assertThat(b2f2.get()).isEqualTo(2d);
     }
     
-    @Test(timeout = 18000)
+    @Test(timeout = 21000)
     public void testPerformance() {
         RMap<String, String> map = redisson.getMap("map");
         Map<String, String> m = new HashMap<String, String>();