honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync createComponents signature with core 

Original commit: elastic/x-pack-elasticsearch@7874ff411f
This commit is contained in:
Ryan Ernst 2016-07-12 15:06:51 -07:00
parent 464e1bee37
commit ed3b4afca9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elasticsearch/x-pack/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
View File

@ -22,6 +22,7 @@ import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.support.ActionFilter;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.component.LifecycleComponent;
import org.elasticsearch.common.inject.Binder;
import org.elasticsearch.common.inject.Module;
@ -38,6 +39,7 @@ import org.elasticsearch.plugins.ScriptPlugin;
import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.script.ScriptContext;
import org.elasticsearch.threadpool.ExecutorBuilder;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.xpack.action.TransportXPackInfoAction;
import org.elasticsearch.xpack.action.TransportXPackUsageAction;
import org.elasticsearch.xpack.action.XPackInfoAction;
@ -177,7 +179,7 @@ public class XPackPlugin extends Plugin implements ScriptPlugin, ActionPlugin {
}
@Override
public Collection<Object> createComponents() {
public Collection<Object> createComponents(Client client, ClusterService clusterService, ThreadPool threadPool) {
List<Object> components = new ArrayList<>();
if (transportClientMode == false) {
// watcher http stuff