Merge branch 'master' into 3.0.0

redisson/src/test/java/org/redisson/RedissonRuntimeEnvironment.java

@@ -9,7 +9,7 @@ import java.util.Locale;
 public class RedissonRuntimeEnvironment {
 
     public static final boolean isTravis = "true".equalsIgnoreCase(System.getProperty("travisEnv"));
-    public static final String redisBinaryPath = System.getProperty("redisBinary", "C:\\Devel\\projects\\redis\\Redis-x64-3.2.100\\redis-server.exe");
+    public static final String redisBinaryPath = System.getProperty("redisBinary", "C:\\Devel\\projects\\redis\\redis-x64-4.0.2.2\\redis-server.exe");
     public static final String tempDir = System.getProperty("java.io.tmpdir");
     public static final String OS;
     public static final boolean isWindows;

redisson/src/test/java/org/redisson/spring/support/SpringNamespaceWikiTest.java

@@ -121,7 +121,6 @@ public class SpringNamespaceWikiTest {
             assertEquals(1, config.getThreads());
             assertEquals(2, config.getNettyThreads());
             assertSame(context.getBean("myCodec", Codec.class), config.getCodec());
-            assertEquals(false, config.isUseLinuxNativeEpoll());
             assertEquals(false, config.isReferenceEnabled());
             assertSame(context.getBean("myCodecProvider", ReferenceCodecProvider.class), config.getReferenceCodecProvider());
             assertSame(context.getBean("myExecutor", Executor.class), config.getExecutor());