From 0f5b25797bececc297cd4e80cba7c37a7eb12f4c Mon Sep 17 00:00:00 2001
From: Scott Mitchell <scott_mitchell@apple.com>
Date: Sat, 23 Apr 2016 11:02:43 -0700
Subject: [PATCH] Revert "EpollEventLoopGroup support Executor"

This reverts commit f8f1efc3badc0d3679ee40f46bfd83d37a7b5c5a. It should not have been backported.
---
 .../io/netty/channel/epoll/EpollEventLoopGroup.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
index f685d5db88..2922625eb0 100644
--- a/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
+++ b/transport-native-epoll/src/main/java/io/netty/channel/epoll/EpollEventLoopGroup.java
@@ -16,7 +16,6 @@
 package io.netty.channel.epoll;
 
 import io.netty.channel.DefaultSelectStrategyFactory;
-import io.netty.channel.EventLoop;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.MultithreadEventLoopGroup;
 import io.netty.channel.SelectStrategyFactory;
@@ -49,7 +48,7 @@ public final class EpollEventLoopGroup extends MultithreadEventLoopGroup {
      */
     @SuppressWarnings("deprecation")
     public EpollEventLoopGroup(int nThreads, SelectStrategyFactory selectStrategyFactory) {
-        this(nThreads, (ThreadFactory) null, selectStrategyFactory);
+        this(nThreads, null, selectStrategyFactory);
     }
 
     /**
@@ -60,10 +59,6 @@ public final class EpollEventLoopGroup extends MultithreadEventLoopGroup {
         this(nThreads, threadFactory, 0);
     }
 
-    public EpollEventLoopGroup(int nThreads, Executor executor) {
-        this(nThreads, executor, DefaultSelectStrategyFactory.INSTANCE);
-    }
-
     /**
      * Create a new instance using the specified number of threads and the given {@link ThreadFactory}.
      */
@@ -96,10 +91,6 @@ public final class EpollEventLoopGroup extends MultithreadEventLoopGroup {
         super(nThreads, threadFactory, maxEventsAtOnce, selectStrategyFactory);
     }
 
-    public EpollEventLoopGroup(int nThreads, Executor executor, SelectStrategyFactory selectStrategyFactory) {
-        super(nThreads, executor, 0, selectStrategyFactory);
-    }
-
     /**
      * Sets the percentage of the desired amount of time spent for I/O in the child event loops.  The default value is
      * {@code 50}, which means the event loop will try to spend the same amount of time for I/O as for non-I/O tasks.