+4 −0

build.gradle

build.gradle

+5 −0

BuildPlugin.groovy

...n/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

+4 −2

PluginPropertiesTask.groovy

...sticsearch/gradle/plugin/PluginPropertiesTask.groovy

+131 −81

ClusterAllocationExplanation.java

...cluster/allocation/ClusterAllocationExplanation.java

+145 −0

NodeExplanation.java

...action/admin/cluster/allocation/NodeExplanation.java

+143 −17

TransportClusterAllocationExplainAction.java

...ocation/TransportClusterAllocationExplainAction.java

+1 −1

IndicesShardStoresResponse.java

...admin/indices/shards/IndicesShardStoresResponse.java

+0 −6

SearchRequestBuilder.java

...lasticsearch/action/search/SearchRequestBuilder.java

+1 −1

MultiPhrasePrefixQuery.java

...rch/common/lucene/search/MultiPhrasePrefixQuery.java

+2 −2

Queries.java

.../org/elasticsearch/common/lucene/search/Queries.java

+7 −2

Setting.java

.../java/org/elasticsearch/common/settings/Setting.java

+2 −4

SizeValue.java

...in/java/org/elasticsearch/common/unit/SizeValue.java

+1 −1

KeyedLock.java

.../elasticsearch/common/util/concurrent/KeyedLock.java

+9 −14

InternalEngine.java

...a/org/elasticsearch/index/engine/InternalEngine.java

+2 −2

IndexFieldMapper.java

...icsearch/index/mapper/internal/IndexFieldMapper.java

+10 −0

AbstractQueryBuilder.java

.../elasticsearch/index/query/AbstractQueryBuilder.java

+12 −0

BoolQueryBuilder.java

.../org/elasticsearch/index/query/BoolQueryBuilder.java

+7 −0

BoostingQueryBuilder.java

.../elasticsearch/index/query/BoostingQueryBuilder.java

+6 −0

ConstantScoreQueryBuilder.java

...ticsearch/index/query/ConstantScoreQueryBuilder.java

+1 −1

ExistsQueryBuilder.java

...rg/elasticsearch/index/query/ExistsQueryBuilder.java

+14 −10

HasChildQueryBuilder.java

.../elasticsearch/index/query/HasChildQueryBuilder.java

+16 −9

HasParentQueryBuilder.java

...elasticsearch/index/query/HasParentQueryBuilder.java

+1 −1

IdsQueryBuilder.java

...a/org/elasticsearch/index/query/IdsQueryBuilder.java

+150 −96

InnerHitBuilder.java/{ → }

...search/index/query/{support → }/InnerHitBuilder.java

+1 −1

MatchNoneQueryBuilder.java

...elasticsearch/index/query/MatchNoneQueryBuilder.java

+16 −8

NestedQueryBuilder.java

...rg/elasticsearch/index/query/NestedQueryBuilder.java

+1 −13

QueryShardContext.java

...org/elasticsearch/index/query/QueryShardContext.java

+1 −1

TermsQueryBuilder.java

...org/elasticsearch/index/query/TermsQueryBuilder.java

+10 −1

FunctionScoreQueryBuilder.java

...x/query/functionscore/FunctionScoreQueryBuilder.java

+0 −126

InnerHitsBuilder.java

...sticsearch/index/query/support/InnerHitsBuilder.java

+5 −1

MatchQuery.java

.../java/org/elasticsearch/index/search/MatchQuery.java

+2 −2

IndicesService.java

...n/java/org/elasticsearch/indices/IndicesService.java

+22 −0

ConfigurationUtils.java

...rg/elasticsearch/ingest/core/ConfigurationUtils.java

+22 −0

IngestDocument.java

...va/org/elasticsearch/ingest/core/IngestDocument.java

+156 −0

DateIndexNameProcessor.java

...csearch/ingest/processor/DateIndexNameProcessor.java

+20 −3

SetProcessor.java

...org/elasticsearch/ingest/processor/SetProcessor.java

+2 −0

NodeModule.java

...src/main/java/org/elasticsearch/node/NodeModule.java

+13 −7

RestTable.java

...org/elasticsearch/rest/action/support/RestTable.java

+0 −6

ScriptMetaData.java

...in/java/org/elasticsearch/script/ScriptMetaData.java

+13 −21

SearchService.java

...ain/java/org/elasticsearch/search/SearchService.java

+2 −31

SearchSourceBuilder.java

...lasticsearch/search/builder/SearchSourceBuilder.java

+2 −1

SnapshotUtils.java

.../java/org/elasticsearch/snapshots/SnapshotUtils.java

+103 −1

ClusterAllocationExplainIT.java

...n/cluster/allocation/ClusterAllocationExplainIT.java

+16 −4

ClusterAllocationExplainTests.java

...luster/allocation/ClusterAllocationExplainTests.java

+195 −18

ClusterAllocationExplanationTests.java

...er/allocation/ClusterAllocationExplanationTests.java

+3 −0

SettingTests.java

.../org/elasticsearch/common/settings/SettingTests.java

+0 −1

AbstractQueryTestCase.java

...elasticsearch/index/query/AbstractQueryTestCase.java

+10 −8

ExistsQueryBuilderTests.java

...asticsearch/index/query/ExistsQueryBuilderTests.java

+18 −23

HasChildQueryBuilderTests.java

...ticsearch/index/query/HasChildQueryBuilderTests.java

+14 −9

HasParentQueryBuilderTests.java

...icsearch/index/query/HasParentQueryBuilderTests.java

+2 −4

IdsQueryBuilderTests.java

.../elasticsearch/index/query/IdsQueryBuilderTests.java

+145 −43

InnerHitBuilderTests.java/{ → }

...h/index/query/{support → }/InnerHitBuilderTests.java

+2 −5

MatchNoneQueryBuilderTests.java

...icsearch/index/query/MatchNoneQueryBuilderTests.java

+2 −1

MatchPhrasePrefixQueryBuilderTests.java

.../index/query/MatchPhrasePrefixQueryBuilderTests.java

+2 −1

MatchPhraseQueryBuilderTests.java

...search/index/query/MatchPhraseQueryBuilderTests.java

+2 −2

MatchQueryBuilderTests.java

...lasticsearch/index/query/MatchQueryBuilderTests.java

+1 −1

MultiMatchQueryBuilderTests.java

...csearch/index/query/MultiMatchQueryBuilderTests.java

+52 −11

NestedQueryBuilderTests.java

...asticsearch/index/query/NestedQueryBuilderTests.java

+41 −30

TermsQueryBuilderTests.java

...lasticsearch/index/query/TermsQueryBuilderTests.java

+0 −140

InnerHitsBuilderTests.java

...earch/index/query/support/InnerHitsBuilderTests.java

+32 −0

IndicesServiceTests.java

...a/org/elasticsearch/indices/IndicesServiceTests.java

+20 −1

ConfigurationUtilsTests.java

...asticsearch/ingest/core/ConfigurationUtilsTests.java

+2 −2

IngestDocumentTests.java

...g/elasticsearch/ingest/core/IngestDocumentTests.java

+99 −0

DateIndexNameFactoryTests.java

...arch/ingest/processor/DateIndexNameFactoryTests.java

+77 −0

DateIndexNameProcessorTests.java

...ch/ingest/processor/DateIndexNameProcessorTests.java

+16 −1

SetProcessorFactoryTests.java

...earch/ingest/processor/SetProcessorFactoryTests.java

+37 −6

SetProcessorTests.java

...lasticsearch/ingest/processor/SetProcessorTests.java

+1 −30

PercolatorIT.java

.../java/org/elasticsearch/percolator/PercolatorIT.java

+0 −10

SearchSourceBuilderTests.java

...csearch/search/builder/SearchSourceBuilderTests.java

+162 −342

InnerHitsIT.java

.../org/elasticsearch/search/innerhits/InnerHitsIT.java

+1 −0

SnapshotUtilsTests.java

.../org/elasticsearch/snapshots/SnapshotUtilsTests.java

+2 −1

ESThreadPoolTestCase.java

...g/elasticsearch/threadpool/ESThreadPoolTestCase.java

+0 −1

ScalingThreadPoolTests.java

...elasticsearch/threadpool/ScalingThreadPoolTests.java

+9 −11

smoke_test_rc.py

dev-tools/smoke_test_rc.py

+22 −3

api-conventions.asciidoc

docs/reference/api-conventions.asciidoc

+8 −2

cat.asciidoc

docs/reference/cat.asciidoc

+8 −7

create-index.asciidoc

docs/reference/indices/create-index.asciidoc

+62 −0

ingest-node.asciidoc

docs/reference/ingest/ingest-node.asciidoc

+4 −3

id-field.asciidoc

docs/reference/mapping/fields/id-field.asciidoc

+1 −1

include-in-all.asciidoc

docs/reference/mapping/params/include-in-all.asciidoc

+1 −1

types.asciidoc

docs/reference/mapping/types.asciidoc

+33 −3

scripting.asciidoc

docs/reference/migration/migrate_5_0/scripting.asciidoc

+3 −2

search.asciidoc

docs/reference/migration/migrate_5_0/search.asciidoc

+1 −75

inner-hits.asciidoc

docs/reference/search/request/inner-hits.asciidoc

+13 −12

10_basic.yaml

...sources/rest-api-spec/test/ingest_grok/10_basic.yaml

+31 −0

build.gradle

plugins/discovery-azure/build.gradle

+21 −5

AzureComputeService.java

...arch/cloud/azure/management/AzureComputeService.java

+9 −15

AzureComputeServiceImpl.java

.../cloud/azure/management/AzureComputeServiceImpl.java

+8 −13

AzureUnicastHostsProvider.java

...earch/discovery/azure/AzureUnicastHostsProvider.java

+3 −0

AzureDiscoveryPlugin.java

...rch/plugin/discovery/azure/AzureDiscoveryPlugin.java

+285 −0

AzureDiscoveryClusterFormationTests.java

...overy/azure/AzureDiscoveryClusterFormationTests.java

+1 −1

Ec2DiscoveryClusterFormationTests.java

...discovery/ec2/Ec2DiscoveryClusterFormationTests.java

+12 −11

10_basic.yaml

...s/rest-api-spec/test/ingest_attachment/10_basic.yaml

+46 −18

GeoIpProcessor.java

...a/org/elasticsearch/ingest/geoip/GeoIpProcessor.java

+39 −2

GeoIpProcessorFactoryTests.java

...csearch/ingest/geoip/GeoIpProcessorFactoryTests.java

+13 −12

10_basic.yaml

...ources/rest-api-spec/test/ingest_geoip/10_basic.yaml

+1 −1

20_geoip_processor.yaml

...t-api-spec/test/ingest_geoip/20_geoip_processor.yaml

+40 −0

MultifieldAttachmentMapperTests.java

...per/attachments/MultifieldAttachmentMapperTests.java

+1 −1

cat.allocation.json

...main/resources/rest-api-spec/api/cat.allocation.json

+1 −1

cat.fielddata.json

.../main/resources/rest-api-spec/api/cat.fielddata.json

+1 −1

cat.recovery.json

...c/main/resources/rest-api-spec/api/cat.recovery.json

+5 −0

cat.thread_pool.json

...ain/resources/rest-api-spec/api/cat.thread_pool.json

+1 −1

10_basic.yaml

...rces/rest-api-spec/test/cat.allocation/10_basic.yaml

+10 −0

10_basic.yaml

...ces/rest-api-spec/test/cat.thread_pool/10_basic.yaml

+29 −0

90_date_index_name_processor.yaml

...i-spec/test/ingest/90_date_index_name_processor.yaml