Merge branch 'dev/1.1.0' into experiment/io_uring

# Conflicts:
#	proxy/build.gradle
This commit is contained in:
Andrew Steinborn
2020-12-10 06:56:49 -05:00

View File

@@ -53,7 +53,6 @@ dependencies {
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64"
implementation "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-aarch_64"
implementation "io.netty.incubator:netty-incubator-transport-native-io_uring:0.0.2.Final:linux-x86_64"
implementation "io.netty:netty-resolver-dns:${nettyVersion}"
implementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
implementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"