Merge branch 'master' into 3.0.0

pull/1833/head
Nikita Koksharov 6 years ago
commit b8ec59164c

@ -132,7 +132,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId> <artifactId>netty-bom</artifactId>
<version>4.1.31.Final</version> <version>4.1.32.Final</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

@ -102,7 +102,6 @@ public class Config {
} }
public Config(Config oldConf) { public Config(Config oldConf) {
setUseLinuxNativeEpoll(oldConf.isUseLinuxNativeEpoll());
setExecutor(oldConf.getExecutor()); setExecutor(oldConf.getExecutor());
if (oldConf.getCodec() == null) { if (oldConf.getCodec() == null) {
@ -447,21 +446,6 @@ public class Config {
return transportMode; return transportMode;
} }
/**
* Use {@link #setTransportMode(TransportMode)}
*/
@Deprecated
public Config setUseLinuxNativeEpoll(boolean useLinuxNativeEpoll) {
if (useLinuxNativeEpoll) {
setTransportMode(TransportMode.EPOLL);
}
return this;
}
public boolean isUseLinuxNativeEpoll() {
return getTransportMode() == TransportMode.EPOLL;
}
/** /**
* Threads amount shared between all redis clients used by Redisson. * Threads amount shared between all redis clients used by Redisson.
* <p> * <p>

Loading…
Cancel
Save