Merge branch 'master' into 3.0.0

# Conflicts:
#	redisson/src/main/java/org/redisson/reactive/RedissonSetCacheReactive.java
pull/1821/head
Nikita 6 years ago
commit 72757710cc

@ -131,7 +131,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.29.Final</version>
<version>4.1.30.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>

@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier;
import org.reactivestreams.Publisher;

Loading…
Cancel
Save