diff options
author | Nik Everett <nik9000@gmail.com> | 2016-02-01 18:33:09 -0500 |
---|---|---|
committer | Nik Everett <nik9000@gmail.com> | 2016-02-01 18:33:09 -0500 |
commit | c1d44780675a9ff43e87a44f62969a0214928988 (patch) | |
tree | 515b696381d64bb693bcabfac8937732c8c431b4 /core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java | |
parent | a034e12bfa04044dead41956f14d0d53d7bb7438 (diff) | |
parent | 7b5ed21d0dda532d43af51d3b5cd44ae6f4b82ed (diff) |
Merge branch 'master' into feature/reindex
Diffstat (limited to 'core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java')
-rw-r--r-- | core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java index 6b8416a872..4f4924693d 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java +++ b/core/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java @@ -65,7 +65,7 @@ public class RestSearchAction extends BaseRestHandler { @Inject public RestSearchAction(Settings settings, RestController controller, Client client, IndicesQueriesRegistry queryRegistry) { - super(settings, controller, client); + super(settings, client); this.queryRegistry = queryRegistry; controller.registerHandler(GET, "/_search", this); controller.registerHandler(POST, "/_search", this); |