From 7068013be85ce8b3029048b74007993e7f103b51 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 31 Aug 2017 07:48:50 +1000
Subject: [PATCH 1/2] Upgrade to Netty 4.1.15.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 28431e5b9e..714d421d65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
 
     <properties>
         <build.number>unknown</build.number>
-        <netty.version>4.1.13.Final</netty.version>
+        <netty.version>4.1.15.Final</netty.version>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From d7010d629d12bc12578d770bfdf48bcf068994d5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 4 Sep 2017 18:15:23 +1000
Subject: [PATCH 2/2] Fix mismatched system properties

---
 proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
index 5f4020ccdc..551ae1e193 100644
--- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
+++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
@@ -116,8 +116,8 @@ public static Class<? extends Channel> getDatagramChannel()
         return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
     }
 
-    private static final int LOW_MARK = Integer.getInteger( "net.md_5.bungee.high_mark", 2 << 18 ); // 0.5 mb
-    private static final int HIGH_MARK = Integer.getInteger( "net.md_5.bungee.low_mark", 2 << 20 ); // 2 mb
+    private static final int LOW_MARK = Integer.getInteger( "net.md_5.bungee.low_mark", 2 << 18 ); // 0.5 mb
+    private static final int HIGH_MARK = Integer.getInteger( "net.md_5.bungee.high_mark", 2 << 20 ); // 2 mb
     private static final WriteBufferWaterMark MARK = new WriteBufferWaterMark( LOW_MARK, HIGH_MARK );
 
     public final static class Base extends ChannelInitializer<Channel>