5f1b867158
Update get-settings.asciidoc
...
Fixed docs for filtering index settings in get-settings API
Closes #13872
2015-10-02 16:46:45 +02:00
8788516e1b
Merge pull request #13868 from hafkensite/patch-1
...
Update example with parameters
2015-10-02 16:24:05 +02:00
8782c8e08d
Update link to Jepsen related test class
2015-10-01 16:34:19 -04:00
cb0003ff6c
Clarify that aliases and indices can't share names
2015-10-01 15:21:34 -04:00
ecc2985b84
Update inner-hits.asciidoc
...
Fix a glitch in inner_hits feature documentation (though I'm not absolutely sure of the final version)
2015-09-30 11:07:51 +02:00
0c0f530c31
Merge pull request #13781 from KimTaehee/master
...
fix typo "Seting" to "Setting"
2015-09-25 15:28:04 +02:00
eaafc62f53
[DOCS] added query-refactoring changes to 3.0 migrate guide
2015-09-25 14:55:37 +02:00
3d3197342d
Merge branch 'master' into merge/query-refactoring
2015-09-25 14:38:53 +02:00
c2296b1d68
Merge pull request #13757 from andrestc/docs-now-time_zone
...
"now" is not affected by "time_zone" in range queries
2015-09-25 13:55:23 +02:00
3ac4da5f84
Merge branch 'master' into feature/query-refactoring
2015-09-25 13:53:06 +02:00
e97b731c46
Merge pull request #13748 from bcoughlin/patch-1
...
Update put-mapping.asciidoc
2015-09-25 12:13:33 +02:00
629ac8e014
Java api: remove TermsLookupQueryBuilder
...
TermsLookupQueryBuilder was left around only for bw comp reasons, but TermsQueryBuilder is its replacement. We can remove it now that it is clear query refactoring goes in master (3.0).
2015-09-25 11:44:05 +02:00
34de79370f
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/ElasticsearchException.java
2015-09-25 09:38:24 +02:00
45e0ccd274
Fix typo
2015-09-25 06:42:21 +09:00
070c836dce
Gives more emphasys
2015-09-24 11:30:00 -03:00
d90fc8f7fd
Documents that now is not affected by time_zone in range queries
2015-09-23 22:00:49 -03:00
4fe243a5ca
Merge pull request #13701 from jasontedor/fix-ping-timeout-settings-inconsistency
...
Fix ping timeout settings inconsistencies
2015-09-23 13:17:46 -04:00
d8b29f7beb
Fix ping timeout settings inconsistencies
...
This commit fixes ping timeout settings inconsistencies in
ZenDiscovery. In particular, the documentation refers to the ping
timeout setting as discovery.zen.ping_timeout but the code was
ultimately using discovery.zen.ping.timeout if this was set.
This commit also changes all instances of the raw string
“discovery.zen.ping_timeout” to the constant
o.e.d.z.ZenDiscovery.SETTING_PING_TIMEOUT.
Finally, this commit removes the legacy setting
"discovery.zen.initial_ping_timeout".
Closes #6579 , #9581 , #9908
2015-09-23 12:58:23 -04:00
dbb01f5b43
Query Refactoring: Move MoreLikeThisQueryBuilder validation to constructor
...
The current MoreLikeThisQueryBuilder validation checks for existence of at
least one `like` text or item. This is hard to check in setters, so this PR
tries to change the construction of the query so that we can do these checks
already at construction time.
Changing to using arrays for fieldnames, likeTexts, likeItems, unlikeTexts
and unlikeItems. `likeTexts` and/or `likeItems` need to be specified at
construction time to validate we have at least one item there.
Relates to #10217
2015-09-23 18:20:46 +02:00
a77c68ba0e
Fix position-increment-gap doc example
2015-09-23 08:04:43 -07:00
e133fdd49f
Update phrase-suggest.asciidoc
...
small sentence fix
2015-09-23 09:24:23 -04:00
0149ed41f4
Update settings.asciidoc
...
generalising to single dash
2015-09-23 14:54:51 +02:00
8da0f89739
Order of command line flags
...
specifying the order required for cli -Des notation arguments
2015-09-23 14:54:50 +02:00
75e816400c
Remove TranslogService and fold it into synchronous IndexShard API
...
This commit moves the size and ops based flush into a synchronous API into
IndexShard and removes the time-based flush alltogether since it' basically
covered by the inactive async flush API we have today. The functionality doesn't
need to be covered by scheduled task and async APIs while we can actually make all
the decisions in a sync manner which is way easier to control and to test.
Closes #13707
2015-09-23 12:39:06 +02:00
7eedd84dc3
Query refactoring: refactor query_string query and score functions
...
Refactor the function_score query so it can be parsed on the coordinating node, split parse into fromXContent and toQuery, make FunctionScoreQueryBuilder Writeable.
Closes #13653
2015-09-23 11:32:54 +02:00
4d47015a0c
Merge pull request #13579 from nik9000/run_plugin_as_elasticsearch_in_tar
...
Run bin/plugin as elasticsearch in tar distro
2015-09-22 11:19:19 -04:00
b521c606ff
[test] Run bin/plugin as right user
...
Before this commit he tests always run bin/plugin as root which is somewhat
unrealistic and causes trouble (log files owned by root instead of
elasticsearch). After this commit `bin/plugin` runs as root when elasticsearch
is installed via the repository and as elasticsearch otherwise which is much
more realistic.
This also adds extra timeout to starting elasticsearch which is required
when all the plugins are installed. And it fixes up a problem with logging
elasticsearch's log if elasticsearch doesn't start which came up multiple
time while debugging this problem.
Also adds docs recommending running `bin/plugin` as the user that owns the
Elasticsearch files or root if installed with the packages.
Closes #13557
2015-09-22 11:17:57 -04:00
3049ef3e35
Merge pull request #13712 from mnylen/patch-1
...
Add docs note about cloud.aws.region (#13668 )
2015-09-22 15:15:54 +02:00
67815eec47
Docs: Removed references to java 7 and debian wheezy
...
Related to #13694
2015-09-22 14:23:30 +02:00
a379400228
Add docs note about cloud.aws.region ( #13668 )
2015-09-22 14:53:54 +03:00
1aae68d2e8
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/CommonTermsQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/MatchQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
core/src/main/java/org/elasticsearch/index/query/QueryParser.java
2015-09-22 12:43:55 +02:00
03035a28a3
Query Refactoring: moving validation to setters and constructors
...
Moving validation from validate() to constructors and setters for the
following query builders:
* GeoDistanceQueryBuilder
* GeoDistanceRangeQueryBuilder
* GeoPolygonQueryBuilder
* GeoShapeQueryBuilder
* GeohashCellQuery
* TermsQueryBuilder
Relates to #10217
2015-09-22 11:05:56 +02:00
877754ba89
reword docs
2015-09-21 14:32:22 -04:00
c67ad3fb2a
[docs] Note that no http settings are dynamic
...
Closes #13364
2015-09-21 13:58:07 -04:00
f230eabc15
[cloud-azure] Split azure plugin in 3 plugins
...
Until now we had a cloud-azure plugin which is providing 3 distinct features:
* discovery on Azure
* snapshot/restore on Aure
* SMB store
This commit splits the plugin by feature so people can use either one or the other or both features.
Doc is updated accordingly.
2015-09-21 17:55:23 +02:00
cc69de5c5f
Merge branch 'master' into feature/query-refactoring
2015-09-21 15:38:43 +02:00
1f76f49003
Update compound-word-tokenfilter.asciidoc
...
Improved the docs for compound work token filter.
Closes #13670
Closes #13595
2015-09-21 11:22:14 +02:00
cbdcdc1b96
Merge pull request #13526 from robertberg/rberg.searchdocs
...
Edit search scroll docs for syntactic style
2015-09-19 21:55:55 +02:00
0279b219bb
Edit search scroll docs for syntactic style
2015-09-19 14:42:14 -05:00
c08d5fdb24
Fixed some asciidoc confusion in index-modules.asciidoc
2015-09-19 18:14:36 +02:00
fa77cf6f6f
Docs: Always quote "@file" argument to --data-binary
...
Closes #13500
2015-09-19 17:28:15 +02:00
03488e3902
Docs: Update query_dsl.asciidoc
...
Minor orthographic fix
Closes #13452
2015-09-19 16:09:53 +02:00
50d984b935
SELECT state, COUNT(*) for clarity
...
Adding state to the SQL syntax to make it more clear, given that the buckets returned include the values of state AND count for each.
Closes #13597
2015-09-19 15:04:21 +02:00
fa56f1da79
Docs: Mention we use DEFLATE for best_compression
...
Closes #13549
2015-09-19 14:02:41 +02:00
2da1baf546
Merge branch 'master' into feature/query-refactoring
2015-09-18 20:38:15 +02:00
197313c19b
Merge branch 'master' into feature/query-refactoring
2015-09-18 20:11:25 +02:00
34862bc9f8
Merge branch 'doc/azure-network-host'
2015-09-18 19:51:57 +02:00
542cf66c61
Update nodeattrs.asciidoc
2015-09-18 13:05:19 +02:00
bab9523c56
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/ElasticsearchException.java
2015-09-18 12:05:03 +02:00
37b46fb79c
Query Refactoring: moving validation to constructors and setters
...
This PR is the second batch in moving the query validation we started
to collect in the validate() method to the corresponding setters
and constructors.
2015-09-17 23:30:42 +02:00
71ec1f09e3
Add documentation for setting network.host with azure discovery
...
With 2.0, we now bind to `localhost` by default instead of binding to the network card and use its IP address.
When the discovery plugin gets from Azure API the list of nodes that should form the cluster, this list is pinged then. But as each node is bound to `localhost`, ping does not get an answer and the node elects itself as the master node.
Closes #13591
2015-09-17 16:29:02 +02:00
887399eebf
Query Refactoring: moving validation to constructors and setters
...
This PR is an initial step to move the query validation we started
to collect in the validate() method to the corresponding setters
and constructors.
2015-09-17 13:57:34 +02:00
516ba6c8f6
Using gcloud CLI as gcutil CLI has been deprecated
2015-09-16 06:43:47 -07:00
a3c68f690b
Refactors MultiMatchQueryBuilder and Parser
...
Relates to #10217
This PR is against the query-refactoring branch.
Closes #13405
2015-09-16 13:41:22 +02:00
8fb1aa9781
Refactors GeoDistanceQueryBuilder/-Parser
...
Splits parsing and Lucene query generation. Switches from storing lat/lon
separately to using GeoPoint instead.
Relates to #10217
2015-09-16 11:15:32 +02:00
a13336da54
Refactors MoreLikeThisQueryBuilder and Parser
...
Relates to #10217
This PR is against the query-refactoring branch.
Closes #13486
2015-09-16 02:09:38 +02:00
90f24c1a79
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/GeoDistanceRangeQueryParser.java
core/src/main/java/org/elasticsearch/index/query/GeoPolygonQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/GeohashCellQuery.java
core/src/main/java/org/elasticsearch/index/query/WrapperQueryBuilder.java
core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
2015-09-14 14:31:01 +02:00
564e1eca42
merge from master
2015-09-14 09:03:45 +02:00
016ba3531a
Merge remote-tracking branch 'dakrone/remove-disable-decider'
2015-09-11 09:28:13 -06:00
b205875c43
Merge pull request #13515 from elastic/docsfix
...
Fix for mappings->_source example in docs
2015-09-11 11:02:55 -04:00
d86c1e8769
Fixes #13417
2015-09-11 07:34:14 -07:00
73f7df510e
Merge branch 'master' into feature/query-refactoring
...
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
2015-09-11 14:15:12 +02:00
df9d4eca66
[docs] Document meaning of "FST" and "FSTs".
...
Conflicts:
docs/reference/index-modules/fielddata.asciidoc
2015-09-11 05:34:41 -04:00
86f1b07df0
Docs: Remove docs for the `filtered`, `and`, `or` and `(f)query` queries.
2015-09-11 11:00:54 +02:00
1b8047e51c
merge master
2015-09-11 09:56:13 +02:00
5ae00a6129
Take initializing shards into consideration during awareness allocation
...
It makes decision consistent.
Fixes #12522
2015-09-11 13:13:36 +09:00
7dea10c053
Merge branch 'logstash-integration'
2015-09-10 14:35:46 -07:00
e4981968ad
[search] Limit the size of the result window
...
Requesting a million hits, or page 100,000 is always a bad idea, but users
may not be aware of this. This adds a per-index limit on the maximum size +
from that can be requested which defaults to 10,000.
This should not interfere with deep-scrolling.
Closes #9311
2015-09-10 15:38:29 -04:00
5d6ee7e82e
Docs: Update integration tests documentation
2015-09-10 19:05:15 +02:00
ab0847e0df
parent/child: several cleanups
...
* Dropped ScoreType in favour of Lucene's ScoreMode
* Removed `score_type` option from `has_child` and `has_parent` queries in favour for the already existing `score_mode` option.
* Removed the score mode `sum` in favour for the already existing `total` score mode. (`sum` doesn't exist in Lucene's ScoreMode class)
* If `max_children` is set to `0` it now really means that zero children are allowed to match.
2015-09-10 17:15:41 +02:00
56b3db6ba3
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/AndQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/AndQueryParser.java
core/src/main/java/org/elasticsearch/index/query/FQueryFilterParser.java
core/src/main/java/org/elasticsearch/index/query/FilteredQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/FilteredQueryParser.java
core/src/main/java/org/elasticsearch/index/query/HasChildQueryParser.java
core/src/main/java/org/elasticsearch/index/query/IndicesQueryParser.java
core/src/main/java/org/elasticsearch/index/query/LimitQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/LimitQueryParser.java
core/src/main/java/org/elasticsearch/index/query/MultiMatchQueryParser.java
core/src/main/java/org/elasticsearch/index/query/OrQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/OrQueryParser.java
core/src/main/java/org/elasticsearch/index/query/QueryFilterBuilder.java
core/src/main/java/org/elasticsearch/index/query/QueryFilterParser.java
core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
core/src/main/java/org/elasticsearch/indices/query/IndicesQueriesRegistry.java
core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
core/src/main/java/org/elasticsearch/search/sort/SortParseElement.java
core/src/test/java/org/elasticsearch/benchmark/search/child/ChildSearchShortCircuitBenchmark.java
core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
2015-09-10 15:52:28 +02:00
2eadc6d595
nested sorting: If sorting by nested field then the `nested_path` should always be specified.
...
Closes #13420
2015-09-10 12:21:12 +02:00
90fac17a2d
Query refactoring: MatchQueryBuilder
...
This add equals, hashcode, read/write methods, separates toQuery and JSON parsing and adds tests.
Also moving MatchQueryBuilder.Type to MatchQuery to MatchQuery, adding serialization and hashcode,
equals there.
Relates to #10217
2015-09-10 12:14:55 +02:00
484fcd49e5
Query refactoring: query_string
...
Relates to #10217
2015-09-10 10:09:24 +02:00
f8c86c7252
Adds links to Logstash plugins under the Integrations page.
2015-09-09 17:57:23 -07:00
db705ab460
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/mapper/internal/ParentFieldMapper.java
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/HasParentQueryParser.java
core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryBuilder.java
core/src/main/java/org/elasticsearch/index/query/MoreLikeThisQueryParser.java
core/src/main/java/org/elasticsearch/index/search/child/ChildrenQuery.java
core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTestCase.java
core/src/test/java/org/elasticsearch/index/search/child/ChildrenConstantScoreQueryTests.java
core/src/test/java/org/elasticsearch/index/search/child/ChildrenQueryTests.java
core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchBwcIT.java
core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java
core/src/test/resources/org/elasticsearch/index/query/simple-query-string.json
2015-09-09 17:08:22 +02:00
73d84e4797
Merge pull request #13376 from martijnvg/remove_pre2x_slow_parent_child
...
Removed pre 2.x parent child implementation
2015-09-09 15:20:10 +02:00
35049a05c3
Allocation: add support for filtering by transport IP address
...
Allocation filtering by IP only works today using the node host address. But in some cases, you might want to filter using the publish address which could be different.
2015-09-09 15:15:53 +02:00
2fb2a12c52
Removed pre 2.x parent child implementation
2015-09-09 13:21:40 +02:00
d2e53e0e0c
Split HasParentQueryParser into toQuery and formXContent
...
This commit splits HasParentQueryParser into toQuery and fromXContent.
This change also deprecates several keys in favor of simplified settings
and adds basic unittests for HasParentQueryParser.
Relates to #10217
2015-09-09 12:06:44 +02:00
a45ee273e3
MLT: builder takes a new Item object like its parser
...
Previously the parser could take any Term Vectors request, but this would be
not the case of the builder which would still use MultiGetRequest.Item. This
introduces a new Item class which is used by both the builder and parser.
Beyond that the rest is mostly cleanups such as:
1) Deprecating the ignoreLike methods, in favor to using unlike.
2) Deprecating and renaming MoreLikeThisBuilder#addItem to addLikeItem.
3) Ordering the methods of MoreLikeThisBuilder more logically.
This change is needed for the upcoming query refactoring of MLT.
Closes #13372
2015-09-09 11:40:27 +02:00
e4e71d8a9a
add points_only option to GeoShapeFieldMapper for optimizing indexing performance on geo_shape indexes designed to store only points. Includes updated documentation and exception handling for ensuring index integrity on points only data.
2015-09-08 16:17:50 -05:00
55795f8ec2
Merge pull request #13383 from rjernst/go_away_transport_paths
...
Remove environment from transport client
2015-09-08 13:28:21 -07:00
81223179df
[doc] Java add missing breaking changes
...
Closes #13151
2015-09-08 21:23:20 +02:00
86ffa38ec7
Add migration guide note about transport client changes to
...
settings/environment
2015-09-08 10:22:46 -07:00
18bec264f9
Split HasChildQueryParser into toQuery and formXContent
...
This is an intial commit that splits HasChildQueryParser / Builder into
the two seperate steps. This one is particularly nasty since it transports
a pretty wild InnerHits object that needs heavy refactoring. Yet, this commit
has still some nocommits and needs more tests and maybe another cleanup but
it's a start to get the code out there.
2015-09-08 17:11:57 +02:00
f2605b34d6
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/ScriptQueryParser.java
2015-09-08 16:11:22 +02:00
2c20658204
Docs: Added deprecation notice for _timestamp and _ttl
2015-09-07 21:16:19 +02:00
8aba6ce93a
Docs: Improved the date histogram docs for time_zone and offset
2015-09-07 19:54:00 +02:00
11c87106ce
docs: inner hits is no longer experimental
2015-09-07 16:58:46 +02:00
0c26e7cd83
Remove the scan and count search types.
...
These search types have been deprecated in 2.1 and 2.0 respectively, and will
be removed in 3.0.
2015-09-07 15:18:45 +02:00
e69551d8df
This commit remove the block for user to set invalid Signer Type.
...
Instead of throw an exception, this change log a warning message
and accept any signer type.
2015-09-05 22:57:05 -07:00
397d5beae1
Aggregations: Add stats_bucket / extended_stats_bucket pipeline aggregations
...
These are the complements to the stats/extended_stats metric aggregations, and can be used
to calculate a variety of statistics over buckets
2015-09-04 15:23:48 -04:00
be3409f1db
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/main/java/org/elasticsearch/index/query/AndQueryParser.java
core/src/main/java/org/elasticsearch/index/query/BoolQueryParser.java
core/src/main/java/org/elasticsearch/index/query/ExistsQueryParser.java
core/src/main/java/org/elasticsearch/index/query/GeoShapeQueryParser.java
core/src/main/java/org/elasticsearch/index/query/MissingQueryParser.java
core/src/main/java/org/elasticsearch/index/query/OrQueryParser.java
core/src/main/java/org/elasticsearch/index/query/QueryParseContext.java
core/src/main/java/org/elasticsearch/index/query/SimpleQueryStringParser.java
core/src/main/java/org/elasticsearch/index/query/SpanContainingQueryParser.java
core/src/main/java/org/elasticsearch/index/query/SpanWithinQueryParser.java
core/src/main/java/org/elasticsearch/index/query/TermsQueryParser.java
core/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortParser.java
core/src/test/java/org/elasticsearch/index/query/SimpleIndexQueryParserTests.java
core/src/test/java/org/elasticsearch/index/search/child/AbstractChildTestCase.java
2015-09-04 19:21:38 +02:00
c5b39ce85e
[DOCS] Fix broken inter-page link
2015-09-03 23:17:01 -04:00
1016734b4c
Aggregations: Add percentiles_bucket pipeline aggregations
...
This pipeline will calculate percentiles over a set of sibling buckets. This is an exact
implementation, meaning it needs to cache a copy of the series in memory and sort it to determine
the percentiles.
This comes with a few limitations: to prevent serializing data around, only the requested percentiles
are calculated (unlike the TDigest version, which allows the java API to ask for any percentile).
It also needs to store the data in-memory, resulting in some overhead if the requested series is
very large.
2015-09-03 22:24:14 -04:00
f216d92d19
Upgrade to lucene 5.4-snapshot r1701068
2015-09-03 15:13:33 -04:00
ffb2f75305
Remove DisableAllocationDecider
...
The `EnableAllocatiorDecider` has replaced the
`DisableAllocationDecider`, which has been deprecated. It can now be
removed.
2015-09-03 09:10:48 -06:00
fa93cc7b89
Merge branch 'master' into feature/query-refactoring
...
Conflicts:
core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java
2015-09-03 13:02:49 +02:00
8e4e98099d
Merge pull request #13307 from brwe/doc-script-fix
...
[doc] remove comment about function_score faster than script sort. It…
2015-09-03 12:36:33 +02:00
Clinton Gormley
Jose Diaz-Gonzalez
Jason Veatch
Thomas Cucchietti
javanna
Taehee Kim
André Carvalho
Jason Tedor
Christoph Büscher
xuzha
ulkas
Antonio Bonuccelli
Simon Willnauer
Nik Everett
David Pilato
Mikko Nylén
Boaz Leskes
Robert Berg
Scott Kingsley Clark
Mark Walkom
Britta Weber
Shaunak Kashyap
Alex Ksikes
Lee Hinman
Shane Connelly
Alexander Pepper
Adrien Grand
Masaru Hasegawa
Paul Echeverri
Alexander Reelsen
Martijn van Groningen
Paul Echeverri
Nicholas Knize
Ryan Ernst
Zachary Tong
Robert Muir