Nits

Author: albertzaharovits

server/src/main/java/org/elasticsearch/indices/IndicesService.java

@@ -231,6 +231,7 @@ public class IndicesService extends AbstractLifecycleComponent
     private final IndicesFieldDataCache indicesFieldDataCache;
     private final CacheCleaner cacheCleaner;
     private final ThreadPool threadPool;
+    @Nullable
     private final ThreadPoolMergeQueue threadPoolMergeQueue;
     private final CircuitBreakerService circuitBreakerService;
     private final BigArrays bigArrays;
@@ -1908,6 +1909,7 @@ public BigArrays getBigArrays() {
         return bigArrays;
     }
 
+    @Nullable
     public ThreadPoolMergeQueue getThreadPoolMergeQueue() {
         return threadPoolMergeQueue;
     }

server/src/main/java/org/elasticsearch/threadpool/ThreadPool.java

@@ -160,6 +160,7 @@ public static ThreadPoolType fromType(String type) {
         entry(Names.WARMER, ThreadPoolType.SCALING),
         entry(Names.SNAPSHOT, ThreadPoolType.SCALING),
         entry(Names.SNAPSHOT_META, ThreadPoolType.SCALING),
+        entry(Names.MERGE, ThreadPoolType.SCALING),
         entry(Names.FORCE_MERGE, ThreadPoolType.FIXED),
         entry(Names.FETCH_SHARD_STARTED, ThreadPoolType.SCALING),
         entry(Names.FETCH_SHARD_STORE, ThreadPoolType.SCALING),