mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-25 22:36:20 +00:00
73f7df510e
Conflicts: core/src/main/java/org/elasticsearch/index/query/HasChildQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java core/src/main/java/org/elasticsearch/index/query/HasParentQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/HasParentQueryParser.java core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryBuilder.java core/src/main/java/org/elasticsearch/index/query/functionscore/FunctionScoreQueryParser.java core/src/main/java/org/elasticsearch/index/query/functionscore/factor/FactorParser.java core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchBenchmark.java core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java core/src/test/java/org/elasticsearch/percolator/PercolatorIT.java core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java docs/reference/query-dsl/has-parent-query.asciidoc