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

Merge branch 'master' into enhancement/remove_node_client_setting

This commit is contained in:
javanna 2016-03-29 21:53:22 +02:00 committed by Luca Cavanna
parent ae34c20a62 4f5f3fe895
commit 19eeb68bc4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java
View File

@ -66,6 +66,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase {
settingsBuilder() settingsBuilder()
.put("index.number_of_shards", 1) .put("index.number_of_shards", 1)
.put("index.number_of_replicas", 0) .put("index.number_of_replicas", 0)
.put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE)
).execute().actionGet(); ).execute().actionGet();
client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet(); client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();

10
docs/reference/migration/migrate_5_0/settings.asciidoc
View File

@ -219,8 +219,8 @@ name of the setting must be prefixed with `es.`.
==== Discovery Settings ==== Discovery Settings
The `discovery.zen.minimum_master_node` must bet set for nodes that are bound The `discovery.zen.minimum_master_node` must bet set for nodes that have
to a non-loopback network interface. We see those nodes as in "production" mode and `network.host`, `network.bind_host`, `network.publish_host`,
thus require the setting. `transport.host`, `transport.bind_host`, or `transport.publish_host`
configuration options set. We see those nodes as in "production" mode
and thus require the setting.