Merge pull request #1925 from gianm/fix-index-generator

Fix reference to INDEX_MAKER in IndexGeneratorJob.

indexing-hadoop/src/main/java/io/druid/indexer/IndexGeneratorJob.java

@@ -475,7 +475,7 @@ public class IndexGeneratorJob implements Jobby
         ProgressIndicator progressIndicator
     ) throws IOException
     {
-      return HadoopDruidIndexerConfig.INDEX_MAKER.mergeQueryableIndex(
+      return HadoopDruidIndexerConfig.INDEX_MERGER.mergeQueryableIndex(
           indexes, aggs, file, config.getIndexSpec(), progressIndicator
       );
     }